6 files changed, 16 insertions, 11 deletions
diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h
index d93c7ee5d2..baa5b5263b 100644
--- a/keyboards/projectcain/relic/config.h
+++ b/keyboards/projectcain/relic/config.h
@@ -16,9 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#define ENCODERS_PAD_A { D4 }
-#define ENCODERS_PAD_B { D6 }
-
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json
index 5c07c8e106..9d0820b4e6 100644
--- a/keyboards/projectcain/relic/info.json
+++ b/keyboards/projectcain/relic/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D4", "pin_b": "D6"}
+        ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index 0d40b434e8..457e2f0ab3 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODERS_PAD_A { D6 }
-#define ENCODERS_PAD_B { D7 }
-#define ENCODER_RESOLUTION 2
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json
index 467c8293e8..488d81b6b8 100644
--- a/keyboards/projectcain/vault35/info.json
+++ b/keyboards/projectcain/vault35/info.json
@@ -8,6 +8,11 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "encoder": {
+      "rotary": [
+        {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
+      ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 1a54f15687..b70109bfa3 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODERS_PAD_A { B3, D1 }
-#define ENCODERS_PAD_B { B2, D2 }
-#define ENCODER_RESOLUTION 2
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json
index a8a4dcba8e..ecfa953fd4 100644
--- a/keyboards/projectcain/vault45/info.json
+++ b/keyboards/projectcain/vault45/info.json
@@ -8,6 +8,12 @@
       "pid": "0x6060",
       "device_version": "0.0.1"
     },
+    "encoder": {
+      "rotary": [
+        {"pin_a": "B3", "pin_b": "B2", "resolution": 2},
+        {"pin_a": "D1", "pin_b": "D2", "resolution": 2}
+      ]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {