diff --git a/keyboards/handwired/adept42/keymaps/default/keymap.c b/keyboards/handwired/adept42/keymaps/default/keymap.c
index 2308b42cb7..0463ed7117 100644
--- a/keyboards/handwired/adept42/keymaps/default/keymap.c
+++ b/keyboards/handwired/adept42/keymaps/default/keymap.c
@@ -8,6 +8,7 @@
 #define _L2 2
 #define _L3 3
 #define _L4 4
+#define KEYMAP_VERSION "2.17"
 
 enum {
   SINGLE_TAP,
@@ -316,16 +317,31 @@ void matrix_scan_user(void) {
       reset_keyboard();
     }
 
-    // display firmware version
-    SEQ_TWO_KEYS(KC_K, KC_V) {
+    // display qmk firmware version
+    SEQ_TWO_KEYS(KC_Q, KC_V) {
       SEND_STRING("QMK firmware: v" QMK_VERSION "\nBuilt on: " QMK_BUILDDATE "\nKeyboard: " QMK_KEYBOARD);
     }
+
+    // display adept42 firmware version
+    SEQ_TWO_KEYS(KC_K, KC_V) {
+      uint8_t msg[RAW_EPSIZE] = {0};
+      sprintf((char *)msg, "V:%s", KEYMAP_VERSION);
+      raw_hid_send(msg, RAW_EPSIZE);
+    }
+
+    // display words per minute
+    SEQ_TWO_KEYS(KC_K, KC_W) {
+      uint8_t msg[RAW_EPSIZE] = {0};
+      sprintf((char *)msg, "W:%03d", get_current_wpm());
+      raw_hid_send(msg, RAW_EPSIZE);
+    }
   }
 }
 
 uint32_t layer_state_set_user(uint32_t state) {
   uint8_t layer = biton32(state);
   uint8_t msg[RAW_EPSIZE] = {0};
+
   sprintf((char *)msg, "L:%u", layer);
   raw_hid_send(msg, RAW_EPSIZE);
 
diff --git a/keyboards/handwired/adept42/keymaps/micro/keymap.c b/keyboards/handwired/adept42/keymaps/micro/keymap.c
index 24a2523224..378200e9ca 100644
--- a/keyboards/handwired/adept42/keymaps/micro/keymap.c
+++ b/keyboards/handwired/adept42/keymaps/micro/keymap.c
@@ -8,6 +8,7 @@
 #define _L2 2
 #define _L3 3
 #define _L4 4
+#define KEYMAP_VERSION "2.17"
 
 enum {
   SINGLE_TAP,
@@ -207,10 +208,24 @@ void matrix_scan_user(void) {
       reset_keyboard();
     }
 
-    // display firmware version
-    SEQ_TWO_KEYS(KC_K, KC_V) {
+    // display qmk firmware version
+    SEQ_TWO_KEYS(KC_Q, KC_V) {
       SEND_STRING("QMK firmware: v" QMK_VERSION "\nBuilt on: " QMK_BUILDDATE "\nKeyboard: " QMK_KEYBOARD);
     }
+
+    // display adept42 firmware version
+    SEQ_TWO_KEYS(KC_K, KC_V) {
+      uint8_t msg[RAW_EPSIZE] = {0};
+      sprintf((char *)msg, "V:%s", KEYMAP_VERSION);
+      raw_hid_send(msg, RAW_EPSIZE);
+    }
+
+    // display words per minute
+    SEQ_TWO_KEYS(KC_K, KC_W) {
+      uint8_t msg[RAW_EPSIZE] = {0};
+      sprintf((char *)msg, "W:%03d", get_current_wpm());
+      raw_hid_send(msg, RAW_EPSIZE);
+    }
   }
 }
 
diff --git a/keyboards/handwired/adept42/keymaps/micro/rules.mk b/keyboards/handwired/adept42/keymaps/micro/rules.mk
index ff544f8814..975f84891e 100644
--- a/keyboards/handwired/adept42/keymaps/micro/rules.mk
+++ b/keyboards/handwired/adept42/keymaps/micro/rules.mk
@@ -2,5 +2,5 @@ LEADER_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 OLED_DRIVER_ENABLE = no
 RGBLIGHT_ENABLE = no
-WPM_ENABLE = no
+WPM_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes