diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json
index dafc536516a..958235156ed 100644
--- a/keyboards/czmao/a17_ds17r3/keyboard.json
+++ b/keyboards/czmao/a17_ds17r3/keyboard.json
@@ -9,20 +9,24 @@
     "usb": {
       "vid": "0x4A17",
       "pid": "0x4A18",
-      "device_version": "1.0.0",
-      "force_nkro": true
+      "device_version": "1.0.0"
+    },
+        "host": {
+        "default": {
+            "nkro": true
+        }
     },
     "features": {
-        "bootmagic": true,
-        "commands": true,
-        "console": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true
+        "bootmagic":true,
+        "commands":true,
+        "console":true,
+        "extrakey":true,
+        "mousekey":true,
+        "nkro":true,
+        "rgb_matrix":true
     },
     "dynamic_keymap": {
-      "layer_count": 8
+      "layer_count":8
     },  
     "matrix_pins": {
       "cols": ["B12", "B14", "B15", "A8"],
@@ -77,23 +81,23 @@
           "animation":"cycle_up_down"
         },
         "layout": [
-        { "flags": 2,   "matrix": [0, 0], "x": 0, "y": 0 },
-        { "flags": 2,   "matrix": [0, 1], "x": 75, "y": 0 },
-        { "flags": 2,   "matrix": [0, 2], "x": 150,  "y": 0 },
-        { "flags": 2,   "matrix": [0, 3], "x": 224,   "y": 0 },
-        { "flags": 2,   "matrix": [1, 0], "x": 0, "y": 16 },
-        { "flags": 2,   "matrix": [1, 1], "x": 75, "y": 16 },
-        { "flags": 2,   "matrix": [1, 2], "x": 150,  "y": 16 },
-        { "flags": 2,   "matrix": [1, 3], "x": 224,   "y": 24 },
-        { "flags": 2,   "matrix": [2, 0], "x": 0, "y": 32 },
-        { "flags": 2,   "matrix": [2, 1], "x": 75, "y": 32 },
-        { "flags": 2,   "matrix": [2, 2], "x": 150,  "y": 32 },
-        { "flags": 2,   "matrix": [3, 0], "x": 0, "y": 48 },
-        { "flags": 2,   "matrix": [3, 1], "x": 75, "y": 48 },
-        { "flags": 2,   "matrix": [3, 2], "x": 150,  "y": 48 },
-        { "flags": 2,   "matrix": [3, 3], "x": 224,   "y": 56 },
-        { "flags": 2,   "matrix": [4, 0], "x": 75, "y": 64 },
-        { "flags": 2,   "matrix": [4, 2], "x": 150,  "y": 64 }
+        { "flags": 4,   "matrix": [0, 0], "x": 0, "y": 0 },
+        { "flags": 4,   "matrix": [0, 1], "x": 75, "y": 0 },
+        { "flags": 4,   "matrix": [0, 2], "x": 150,  "y": 0 },
+        { "flags": 4,   "matrix": [0, 3], "x": 224,   "y": 0 },
+        { "flags": 4,   "matrix": [1, 0], "x": 0, "y": 16 },
+        { "flags": 4,   "matrix": [1, 1], "x": 75, "y": 16 },
+        { "flags": 4,   "matrix": [1, 2], "x": 150,  "y": 16 },
+        { "flags": 4,   "matrix": [1, 3], "x": 224,   "y": 24 },
+        { "flags": 4,   "matrix": [2, 0], "x": 0, "y": 32 },
+        { "flags": 4,   "matrix": [2, 1], "x": 75, "y": 32 },
+        { "flags": 4,   "matrix": [2, 2], "x": 150,  "y": 32 },
+        { "flags": 4,   "matrix": [3, 0], "x": 0, "y": 48 },
+        { "flags": 4,   "matrix": [3, 1], "x": 75, "y": 48 },
+        { "flags": 4,   "matrix": [3, 2], "x": 150,  "y": 48 },
+        { "flags": 4,   "matrix": [3, 3], "x": 224,   "y": 56 },
+        { "flags": 4,   "matrix": [4, 0], "x": 75, "y": 64 },
+        { "flags": 4,   "matrix": [4, 2], "x": 150,  "y": 64 }
         ],
         "sleep": true
     },
@@ -101,23 +105,23 @@
     "layouts": {
       "LAYOUT_numpad_5x4": {
         "layout": [
-          {"label":"FN",    "matrix": [ 0,0],"x":0,"y":0},
-          {"label":"PSLS",  "matrix": [ 0,1],"x":1,"y":0},
-          {"label":"PAST",  "matrix": [ 0,2],"x":2,"y":0},
-          {"label":"PMNS",  "matrix": [ 0,3],"x":3,"y":0},
-          {"label":"P7",    "matrix": [ 1,0],"x":0,"y":1},
-          {"label":"P8",    "matrix": [ 1,1],"x":1,"y":1},
-          {"label":"P9",    "matrix": [ 1,2],"x":2,"y":1},
+          {"label":"FN",    "matrix": [0,0],"x":0,"y":0},
+          {"label":"PSLS",  "matrix": [0,1],"x":1,"y":0},
+          {"label":"PAST",  "matrix": [0,2],"x":2,"y":0},
+          {"label":"PMNS",  "matrix": [0,3],"x":3,"y":0},
+          {"label":"P7",    "matrix": [1,0],"x":0,"y":1},
+          {"label":"P8",    "matrix": [1,1],"x":1,"y":1},
+          {"label":"P9",    "matrix": [1,2],"x":2,"y":1},
           {"label":"P4",    "matrix": [2,0],"x":0,"y":2},
           {"label":"P5",    "matrix": [2,1],"x":1,"y":2},
           {"label":"P6",    "matrix": [2,2],"x":2,"y":2},
           {"label":"PPLS",  "matrix": [1,3],"x":3,"y":1,"h":2},         
-          {"label":"P1",    "matrix": [ 3,0],"x":0,"y":3},
-          {"label":"P2",    "matrix": [ 3,1],"x":1,"y":3},
-          {"label":"P3",    "matrix": [ 3,2],"x":2,"y":3},         
-          {"label":"P0",    "matrix": [ 4,0],"x":0,"y":4, "w": 2},
-          {"label":"PDOT",  "matrix": [ 4,2],"x":2,"y":4},
-          {"label":"PENT",  "matrix": [ 3,3],"x":3,"y":3,"h":2}
+          {"label":"P1",    "matrix": [3,0],"x":0,"y":3},
+          {"label":"P2",    "matrix": [3,1],"x":1,"y":3},
+          {"label":"P3",    "matrix": [3,2],"x":2,"y":3},         
+          {"label":"P0",    "matrix": [4,0],"x":0,"y":4, "w": 2},
+          {"label":"PDOT",  "matrix": [4,2],"x":2,"y":4},
+          {"label":"PENT",  "matrix": [3,3],"x":3,"y":3,"h":2}
           ]
         }
       }
diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/keyboards/czmao/a17_ds17r3/readme.md
index f2f3ef0e403..527d5afb314 100644
--- a/keyboards/czmao/a17_ds17r3/readme.md
+++ b/keyboards/czmao/a17_ds17r3/readme.md
@@ -1,17 +1,17 @@
 # mao ds 17r3 Righthand
 
 A 17keys numberpad keyboard with RGB backlight.
-This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU.
+This keyboard use APM32F103CBT6(STM32F103CBT6) as MCU.
 
 - Keyboard Maintainer: https://github.com/micahyy
 - Hardware Supported: CZMAO
 - Hardware Availability: [TaoBao](https://item.taobao.com/item.htm?ft=t&id=819874589305)
 
-    make czmao/ds17r3l:default
+    make czmao/a17_ds17r3:default
 
-Make example for this keyboard (after setting up your build environment):
+- Flashing example for this keyboard:
+    make czmao/a17_ds17r3:default:flash
 
-    make czmao/ds17r3r:default