diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40e1f2a5..24b5ae4a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -615,6 +615,7 @@ set(INCLUDE_FILES
         drivers/DebugPins.h
         drivers/InternalFlash.h
         drivers/Hrs3300.h
+        drivers/PinMap.h
         drivers/Bma421.h
         drivers/Bma421_C/bma4.c
         drivers/Bma421_C/bma423.c
diff --git a/src/components/battery/BatteryController.h b/src/components/battery/BatteryController.h
index 1333ad0e..cd66ff8f 100644
--- a/src/components/battery/BatteryController.h
+++ b/src/components/battery/BatteryController.h
@@ -3,6 +3,7 @@
 #include <drivers/include/nrfx_saadc.h>
 #include <array>
 #include <numeric>
+#include <drivers/PinMap.h>
 
 namespace Pinetime {
   namespace Controllers {
@@ -72,7 +73,7 @@ namespace Pinetime {
       static constexpr uint8_t percentRemainingSamples = 5;
       CircBuffer<percentRemainingSamples> percentRemainingBuffer {};
 
-      static constexpr uint32_t chargingPin = 12;
+      static constexpr uint32_t chargingPin = PINMAP_CHARGING_PIN;
       static constexpr uint32_t powerPresentPin = 19;
       static constexpr nrf_saadc_input_t batteryVoltageAdcInput = NRF_SAADC_INPUT_AIN7;
       uint16_t voltage = 0;
diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 14c296ea..fa53907a 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "TwiMaster.h"
+#include <drivers/PinMap.h>
 
 namespace Pinetime {
   namespace Drivers {
@@ -40,7 +41,7 @@ namespace Pinetime {
 
     private:
       static constexpr uint8_t pinIrq = 28;
-      static constexpr uint8_t pinReset = 10;
+      static constexpr uint8_t pinReset = PINMAP_CST816S_RESET_PIN;
       static constexpr uint8_t lastTouchId = 0x0f;
       static constexpr uint8_t touchPointNumIndex = 2;
       static constexpr uint8_t touchMiscIndex = 8;
diff --git a/src/drivers/PinMap.h b/src/drivers/PinMap.h
new file mode 100644
index 00000000..61bb10e4
--- /dev/null
+++ b/src/drivers/PinMap.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#ifdef WATCH_P8
+
+// BatteryController.h
+#define PINMAP_CHARGING_PIN 19
+
+// Cst816s.h
+#define PINMAP_CST816S_RESET_PIN 13
+
+// SystemTask.h
+#define PINMAP_BUTTON_PIN 17
+
+#else
+
+// BatteryController.h
+#define PINMAP_CHARGING_PIN 12
+
+// Cst816s.h
+#define PINMAP_CST816S_RESET_PIN 10
+
+// SystemTask.h
+#define PINMAP_BUTTON_PIN 13
+
+#endif
\ No newline at end of file
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index ba434298..2756f774 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -8,6 +8,7 @@
 #include <heartratetask/HeartRateTask.h>
 #include <components/settings/Settings.h>
 #include <drivers/Bma421.h>
+#include <drivers/PinMap.h>
 #include <components/motion/MotionController.h>
 
 #include "SystemMonitor.h"
@@ -120,7 +121,7 @@ namespace Pinetime {
       static constexpr uint8_t pinSpiMiso = 4;
       static constexpr uint8_t pinSpiCsn = 25;
       static constexpr uint8_t pinLcdDataCommand = 18;
-      static constexpr uint8_t pinButton = 13;
+      static constexpr uint8_t pinButton = PINMAP_BUTTON_PIN;
       static constexpr uint8_t pinTouchIrq = 28;
       static constexpr uint8_t pinPowerPresentIrq = 19;