diff --git a/variants/deneyapkart/pins_arduino.h b/variants/deneyapkart/pins_arduino.h
index 51951d31994..9b28273cc7d 100644
--- a/variants/deneyapkart/pins_arduino.h
+++ b/variants/deneyapkart/pins_arduino.h
@@ -17,7 +17,6 @@ static const uint8_t LED_BUILTIN = 4;
 #define LEDB        LED_BUILTIN
 #define LEDR 3
 #define LEDG 1
-#define LEDB 4
 
 static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
diff --git a/variants/deneyapkart1A/pins_arduino.h b/variants/deneyapkart1A/pins_arduino.h
index 7f71dd445ed..a079608fe16 100644
--- a/variants/deneyapkart1A/pins_arduino.h
+++ b/variants/deneyapkart1A/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define EXTERNAL_NUM_INTERRUPTS 16
 #define NUM_DIGITAL_PINS        40
@@ -11,7 +12,7 @@
 #define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 34)
 
-static const uint8_t LED_BUILTIN = 13;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+13;
 #define BUILTIN_LED LED_BUILTIN
 #define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
diff --git a/variants/deneyapkart1Av2/pins_arduino.h b/variants/deneyapkart1Av2/pins_arduino.h
index 9c0ab3df9a7..24928d48422 100644
--- a/variants/deneyapkart1Av2/pins_arduino.h
+++ b/variants/deneyapkart1Av2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x303A
 #define USB_PID            0x8147
@@ -17,7 +18,7 @@
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
-static const uint8_t LED_BUILTIN = 48;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED LED_BUILTIN
 #define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
diff --git a/variants/deneyapkartg/pins_arduino.h b/variants/deneyapkartg/pins_arduino.h
index 1fa08d0892a..f73f172876d 100644
--- a/variants/deneyapkartg/pins_arduino.h
+++ b/variants/deneyapkartg/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x303A
 #define USB_PID            0x814A
@@ -17,7 +18,7 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
-static const uint8_t LED_BUILTIN = 10;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+10;
 #define BUILTIN_LED LED_BUILTIN
 #define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
diff --git a/variants/deneyapmini/pins_arduino.h b/variants/deneyapmini/pins_arduino.h
index b64015ff862..439bbb552af 100644
--- a/variants/deneyapmini/pins_arduino.h
+++ b/variants/deneyapmini/pins_arduino.h
@@ -23,7 +23,6 @@ static const uint8_t LED_BUILTIN = 35;
 #define LEDB        LED_BUILTIN
 #define LEDR 34
 #define LEDG 33
-#define LEDB 35
 
 static const uint8_t GPKEY = 0;
 #define KEY_BUILTIN GPKEY
@@ -82,6 +81,7 @@ static const uint8_t PWM1 = 41;
 static const uint8_t DAC0 = 17;
 static const uint8_t DAC1 = 18;
 
+/*
 #define SD SDA
 #define SC SCL
 
@@ -91,5 +91,6 @@ static const uint8_t DAC1 = 18;
 
 #define DA0 DAC0
 #define DA1 DAC1
+*/
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/deneyapminiv2/pins_arduino.h b/variants/deneyapminiv2/pins_arduino.h
index 90c09eb9f73..0c62545455d 100644
--- a/variants/deneyapminiv2/pins_arduino.h
+++ b/variants/deneyapminiv2/pins_arduino.h
@@ -2,6 +2,7 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
+#include "soc/soc_caps.h"
 
 #define USB_VID            0x303A
 #define USB_PID            0x8144
@@ -17,7 +18,7 @@
 #define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
 #define digitalPinHasPWM(p)         (p < 46)
 
-static const uint8_t LED_BUILTIN = 33;
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+33;
 #define BUILTIN_LED LED_BUILTIN
 #define LED_BUILTIN LED_BUILTIN
 #define RGB_BUILTIN LED_BUILTIN
@@ -80,6 +81,7 @@ static const uint8_t PWM1 = 41;
 static const uint8_t DAC0 = 17;
 static const uint8_t DAC1 = 18;
 
+/*
 #define SD SDA
 #define SC SCL
 
@@ -89,5 +91,6 @@ static const uint8_t DAC1 = 18;
 
 #define DA0 DAC0
 #define DA1 DAC1
+*/
 
 #endif /* Pins_Arduino_h */