diff --git a/include/qrw/Joystick.hpp b/include/qrw/Joystick.hpp
index e2ffd7872ce1ac6c074ade466ff82487f74acb91..ff95e8c76b629c0331c1c988330693eef46a3f84 100644
--- a/include/qrw/Joystick.hpp
+++ b/include/qrw/Joystick.hpp
@@ -116,14 +116,14 @@ class Joystick {
 
   // Maximum velocity values
   double vXScale = 0.3;  // Lateral
-  double vYScale = 0.6;  // Forward
+  double vYScale = 0.5;  // Forward
   double vYawScale = 1.0;  // Rotation
 
   // Maximum position values
-  double pRollScale = 0.32;  // Lateral
-  double pPitchScale = 0.28;  // Forward
+  double pRollScale = -0.32;  // Lateral
+  double pPitchScale = -0.28;  // Forward
   double pHeightScale = 0.025;  // Forward
-  double pYawScale = 0.25;  // Rotation
+  double pYawScale = -0.35;  // Rotation
 
   // Variable to handle the automatic static/trot switching
   bool switch_static = false;
diff --git a/scripts/Controller.py b/scripts/Controller.py
index 714f1ef15e9b2b7fd46f22cc337030fa0c4c4247..c7070ec4ec248dc09b8f150da4d04ba61656e704 100644
--- a/scripts/Controller.py
+++ b/scripts/Controller.py
@@ -361,7 +361,7 @@ class Controller:
                 # self.p_ref[3, 0] = np.clip((self.k - 2000) / 2000, 0.0, 1.0)
                 self.xgoals[[3, 4], 0] = self.p_ref[[3, 4], 0]
                 self.h_ref = self.p_ref[2, 0]
-                hRb = pin.rpy.rpyToMatrix(0.0, 0.0, self.p_ref[3, 0] * 0.35)
+                hRb = pin.rpy.rpyToMatrix(0.0, 0.0, self.p_ref[5, 0])
                 # print(self.joystick.getPRef())
                 # print(self.p_ref[2])
             else: