diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
index 06cdbee..ac8916e 100644
--- a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
+++ b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
@@ -16,6 +16,16 @@
 
 #include QMK_KEYBOARD_H
 
+enum {
+    TD_SAFEBOOT,
+};
+
+// https://github.com/qmk/qmk_firmware/blob/master/docs/feature_tap_dance.md
+tap_dance_action_t tap_dance_actions[] = {
+    // Tap twice for boot
+    [TD_SAFEBOOT] = ACTION_TAP_DANCE_DOUBLE(_______, QK_BOOT),
+};
+
 // https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
 // https://github.com/qmk/qmk_firmware/blob/master/docs/feature_grave_esc.md
 // https://github.com/qmk/qmk_firmware/blob/master/docs/mod_tap.md
@@ -33,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
         XXXXXXX, TG(2), _______, _______, _______, _______, XXXXXXX),
     [2] = LAYOUT_60_tsangan_hhkb(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        TD_SAFEBOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         KC_CAPS, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______,
diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk b/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
index 5cfe84b..38909fa 100644
--- a/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
+++ b/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
@@ -17,3 +17,5 @@ MAGIC_ENABLE = no
 # Feature
 # https://github.com/qmk/qmk_firmware/blob/master/docs/feature_bootmagic.md
 BOOTMAGIC_ENABLE = yes
+
+TAP_DANCE_ENABLE = yes
diff --git a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
index d93dfee..08a4603 100644
--- a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
+++ b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
@@ -4,7 +4,7 @@
     "layers": [
         ["QK_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "CTL_T(KC_ESC)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "RSFT_T(KC_ENT)", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_NO", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_RGUI", "KC_RALT", "KC_NO"],
         ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DOWN", "KC_TRNS", "KC_TRNS", "KC_NO", "TG(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO"],
-        ["QK_BOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_CAPS", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"]
+        ["TD_SAFEBOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_CAPS", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"]
     ],
     "layout": "LAYOUT_60_tsangan_hhkb"
 }
\ No newline at end of file