diff --git a/build_all.sh b/build_all.sh
index 54f6b651..14d58440 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -7,10 +7,11 @@
 
 set -e  # Exit on error
 
-KEYBOARD="sweeeeep"
+KEYBOARD="fingerpunch/sweeeeep"
 KEYMAP="smathev"
-OUTPUT_NAME="sweeeeep_smathev"
+OUTPUT_NAME="fingerpunch_sweeeeep_smathev"
 
+QMK_USERSPACE_DIR="$HOME/git_dev/keyboards/qmk_userspace"
 CONFIG_FILE="$HOME/git_dev/keyboards/qmk_userspace/keyboards/fingerpunch/sweeeeep/keymaps/smathev/config.h"
 BACKUP_FILE="${CONFIG_FILE}.backup"
 QMK_FIRMWARE_DIR="$HOME/git_dev/keyboards/qmk_firmware"
@@ -96,8 +97,12 @@ fi
 # Restore original config
 cp "$BACKUP_FILE" "$CONFIG_FILE"
 rm "$BACKUP_FILE"
+echo "removing $QMK_FIRMWARE_DIR/${OUTPUT_NAME}.uf2"
 rm "$QMK_FIRMWARE_DIR/${OUTPUT_NAME}.uf2"
-
+echo "$QMK_FIRMWARE_DIR/${OUTPUT_NAME}.uf2 removed successfully"
+echo "removing $QMK_USERSPACE_DIR/${OUTPUT_NAME}.uf2"
+rm "$QMK_USERSPACE_DIR/${OUTPUT_NAME}.uf2"
+echo "$QMK_USERSPACE_DIR/${OUTPUT_NAME}.uf2 removed successfully"
 
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
diff --git a/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json
index 08cf8df3..ecc3005c 100644
--- a/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json
+++ b/keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.json
@@ -1,3 +1,4 @@
 {
-    "converter": "liatris"
+    "converter": "liatris",
+    "modules": ["getreuer/speculative_hold"]
 }
diff --git a/users/smathev/combos.c b/users/smathev/combos.c
index 0ba94e02..c0931096 100644
--- a/users/smathev/combos.c
+++ b/users/smathev/combos.c
@@ -9,7 +9,6 @@ const uint16_t PROGMEM undo_combo[] = {KC_X, KC_H, COMBO_END}; // L3_K1 + L3_K2
 const uint16_t PROGMEM cut_combo[] = {KC_H, KC_L, COMBO_END}; //L3_K2 + L3_K3
 const uint16_t PROGMEM copy_combo[] = {KC_L, KC_F, COMBO_END}; // L3_K3 + L3_K4
 const uint16_t PROGMEM paste_combo[] = {KC_C, KC_COMM, COMBO_END}; // L3_K4 + L3_K5 KC_I
-
 const uint16_t PROGMEM enter_combo[] = {KC_S, KC_D, COMBO_END}; // R2_K4 + R2_K5
 const uint16_t PROGMEM tab_combo[] = {KC_O, KC_I, COMBO_END}; // L2_K1 + L2_K2
 const uint16_t PROGMEM delete_combo[] = {KC_L, KC_H, COMBO_END}; // R1_K3 + R1_K4
diff --git a/users/smathev/rules.mk b/users/smathev/rules.mk
index 3be12623..85a42f9c 100644
--- a/users/smathev/rules.mk
+++ b/users/smathev/rules.mk
@@ -11,6 +11,9 @@ DEFERRED_EXEC_ENABLE = yes
 
 # Userspace-specific features
 COMBO_ENABLE = yes           # Combo key feature
+# Use the actual keymap.c for introspection instead of the generated one from keymap.json
+INTROSPECTION_KEYMAP_C = keyboards/fingerpunch/sweeeeep/keymaps/smathev/keymap.c
+
 AUTO_SHIFT_ENABLE = yes      # Auto shift for hold-to-shift
 
 # Implemented from  https://github.com/samhocevar-forks/qmk-firmware/blob/master/docs/feature_tap_dance.md