diff --git a/src/target/Arduino/nano33ble/HwJoystick.cpp b/src/target/Arduino/nano33ble/HwJoystick.cpp
index d237f3c..4bcd315 100644
--- a/src/target/Arduino/nano33ble/HwJoystick.cpp
+++ b/src/target/Arduino/nano33ble/HwJoystick.cpp
@@ -14,13 +14,13 @@
 static void pollButtons();
 static inline void readButton(JoystickButton button, uint8_t buttonPin, uint8_t &buttonCount);
 
-#define BUTTON_A_PIN 2
+#define BUTTON_A_PIN 4
 uint8_t buttonACount = 0;
-#define BUTTON_B_PIN 3
+#define BUTTON_B_PIN 5
 uint8_t buttonBCount = 0;
-#define BUTTON_C_PIN 4
+#define BUTTON_C_PIN 6
 uint8_t buttonCCount = 0;
-#define BUTTON_D_PIN 5
+#define BUTTON_D_PIN 7
 uint8_t buttonDCount = 0;
 
 ButtonStateType buttonState;
diff --git a/src/target/Arduino/rp2040/HwJoystick.cpp b/src/target/Arduino/rp2040/HwJoystick.cpp
index 833bf1a..6b60ead 100644
--- a/src/target/Arduino/rp2040/HwJoystick.cpp
+++ b/src/target/Arduino/rp2040/HwJoystick.cpp
@@ -14,13 +14,13 @@
 static void pollButtons();
 static inline void readButton(JoystickButton button, uint8_t buttonPin, uint8_t &buttonCount);
 
-#define BUTTON_A_PIN 2
+#define BUTTON_A_PIN 4
 uint8_t buttonACount = 0;
-#define BUTTON_B_PIN 3
+#define BUTTON_B_PIN 5
 uint8_t buttonBCount = 0;
-#define BUTTON_C_PIN 4
+#define BUTTON_C_PIN 6
 uint8_t buttonCCount = 0;
-#define BUTTON_D_PIN 5
+#define BUTTON_D_PIN 7
 uint8_t buttonDCount = 0;
 
 ButtonStateType buttonState;
diff --git a/src/target/micropython/rp2040/HwJoystick.cpp b/src/target/micropython/rp2040/HwJoystick.cpp
index 46c5a7f..5c9b832 100644
--- a/src/target/micropython/rp2040/HwJoystick.cpp
+++ b/src/target/micropython/rp2040/HwJoystick.cpp
@@ -18,13 +18,13 @@ static void pollButtons();
 static inline void readButton(JoystickButton button, mp_obj_base_t *buttonPin);
 
 static mp_pin_p_t *pinproto;
-#define BUTTON_A_PIN 25
+#define BUTTON_A_PIN 16
 static mp_obj_base_t *aPin;
-#define BUTTON_B_PIN 15
+#define BUTTON_B_PIN 17
 static mp_obj_base_t *bPin;
-#define BUTTON_C_PIN 16
+#define BUTTON_C_PIN 18
 static mp_obj_base_t *cPin;
-#define BUTTON_D_PIN 17
+#define BUTTON_D_PIN 19
 static mp_obj_base_t *dPin;
 
 ButtonStateType buttonState;