diff --git a/variants/CH32V00x/CH32V003F4/PeripheralPins.c b/variants/CH32V00x/CH32V003F4/PeripheralPins.c
index c100712..d55beed 100644
--- a/variants/CH32V00x/CH32V003F4/PeripheralPins.c
+++ b/variants/CH32V00x/CH32V003F4/PeripheralPins.c
@@ -47,14 +47,18 @@ WEAK const PinMap PinMap_ADC[] = {
 //*** I2C ***
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SDA[] = {
-  {PC_1, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
+  {PC_1, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_Remap_I2C1_DISABLE)},
+  {PD_0, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap_I2C1_ENABLE)},
+  {PC_6, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_FullRemap_I2C1_ENABLE)},
   {NC,   NP,   0}
 };
 #endif
 
 #ifdef I2C_MODULE_ENABLED
 WEAK const PinMap PinMap_I2C_SCL[] = {
-  {PC_2, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_NONE)},
+  {PC_2, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_Remap_I2C1_DISABLE)},
+  {PD_1, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_PartialRemap_I2C1_ENABLE)},
+  {PC_5, I2C1, CH_PIN_DATA(CH_MODE_OUTPUT_50MHz, CH_CNF_OUTPUT_AFOD, NOPULL, AFIO_FullRemap_I2C1_ENABLE)},
   {NC,   NP,   0}
 };
 #endif