diff --git a/build.yaml b/build.yaml
index d85a473..3aeebcd 100644
--- a/build.yaml
+++ b/build.yaml
@@ -20,8 +20,8 @@
 include:
   - board: nice_nano_v2
     shield: ergoalex_left
-  # - board: nice_nano_v2
-  #   shield: ergoalex_right
-  # - board: nice_nano_v2
-  #   shield: settings_reset
+  - board: nice_nano_v2
+    shield: ergoalex_right
+  - board: nice_nano_v2
+    shield: settings_reset
 
diff --git a/config/boards/shields/ergoalex/Kconfig.defconfig b/config/boards/shields/ergoalex/Kconfig.defconfig
index aef9219..c77e7b8 100644
--- a/config/boards/shields/ergoalex/Kconfig.defconfig
+++ b/config/boards/shields/ergoalex/Kconfig.defconfig
@@ -1,4 +1,4 @@
-if SHIELD_ERGOALEX_LEFT
+if SHIELD_ERGOALEX_RIGHT
 
     config ZMK_KEYBOARD_NAME
         default "ergoalex"
diff --git a/config/boards/shields/ergoalex/ergoalex.conf b/config/boards/shields/ergoalex/ergoalex.conf
index 0e94cf6..822448c 100644
--- a/config/boards/shields/ergoalex/ergoalex.conf
+++ b/config/boards/shields/ergoalex/ergoalex.conf
@@ -1,9 +1,8 @@
-CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=3600000
+CONFIG_ZMK_SLEEP=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y
 CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y
-CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=15
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=20
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 
-