diff --git a/keyboards/handwired/wwa/soyuzxl_encoder/config.h b/keyboards/handwired/wwa/soyuzxl_encoder/config.h
index ac19b50bc81..2cb6c3d0c4d 100644
--- a/keyboards/handwired/wwa/soyuzxl_encoder/config.h
+++ b/keyboards/handwired/wwa/soyuzxl_encoder/config.h
@@ -2,9 +2,4 @@
 
 #define POT1_PIN GP26
 
-#define ENCODERS_PAD_A { GP14, GP21, GP19, GP17}
-#define ENCODERS_PAD_B { GP15, GP22, GP20, GP18}
-#define MAX_QUEUED_ENCODER_EVENTS 4
-
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
+#define ENCODER_DIRECTION_FLIP
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl_encoder/keyboard.json b/keyboards/handwired/wwa/soyuzxl_encoder/keyboard.json
index 89c6d1a300f..628281875a3 100644
--- a/keyboards/handwired/wwa/soyuzxl_encoder/keyboard.json
+++ b/keyboards/handwired/wwa/soyuzxl_encoder/keyboard.json
@@ -10,8 +10,14 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true
+        "nkro": true,
+        "consumer_enable": false,
+        "encoder_enable": true,
+        "midi_enable": true,
+        "audio_enable": false,
+        "analog_enable": true
     },
+    
     "matrix_pins": {
         "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
         "rows": ["GP7", "GP8", "GP9"]
@@ -51,5 +57,29 @@
                 {"matrix": [2, 6], "x": 6, "y": 2}
             ]
         }
-    }
+    },
+    "encoder": {
+        "rotary": [
+          {
+            "pin_a": "GP14",  
+            "pin_b": "GP15",  
+            "resolution": 4
+          },
+          {
+            "pin_a": "GP16",  
+            "pin_b": "GP17",  
+            "resolution": 4
+          },
+          {
+            "pin_a": "GP18",  
+            "pin_b": "GP19",  
+            "resolution": 4
+          },
+          {
+            "pin_a": "GP20",  
+            "pin_b": "GP21",  
+            "resolution": 4
+          }
+        ]
+      }
 }
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl_encoder/rules.mk b/keyboards/handwired/wwa/soyuzxl_encoder/rules.mk
deleted file mode 100644
index 59430613844..00000000000
--- a/keyboards/handwired/wwa/soyuzxl_encoder/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CONSUMER_ENABLE = no
-ENCODER_ENABLE = yes
-MIDI_ENABLE = yes
-AUDIO_ENABLE = no
-ANALOG_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/wwa/soyuzxl_encoder/soyuzvia.json b/keyboards/handwired/wwa/soyuzxl_encoder/soyuzvia.json
deleted file mode 100644
index ed63a2189f1..00000000000
--- a/keyboards/handwired/wwa/soyuzxl_encoder/soyuzvia.json
+++ /dev/null
@@ -1,17 +0,0 @@
-  {
-    "name": "SoyuzXL_Encoder",
-    "vendorId": "0x5757",
-    "productId": "0x0007",
-    "matrix": {
-      "rows": 3,
-      "cols": 7
-    },
-    "layouts": {
-      "keymap": [
-        [{"x":0.5,"a":7},"e0",{"x":0.5},"e1",{"x":1},"e2",{"x":0.5},"e3"],
-        [{"a":4},"0,0","0,1","0,2","0,3","0,4","0,5","0,6"],
-        ["1,0","1,1","1,2","1,3","1,4","1,5","1,6"],
-        ["2,0","2,1","2,2","2,3","2,4","2,5","2,6"]
-      ]
-    }
-  }
\ No newline at end of file