diff --git a/ports/psoc6/Makefile b/ports/psoc6/Makefile
index dc886df49fe83..c9f93c4a76834 100644
--- a/ports/psoc6/Makefile
+++ b/ports/psoc6/Makefile
@@ -17,13 +17,6 @@ endif
 MAKE_PINS_CSV = ./boards/make-pins-csv.py
 MAKE_PINS = ./boards/make-pins.py
 
-ifeq ($(BOARD), CY8CPROTO-062-4343W)
-PIN_PACKAGE_FILE = cyhal_psoc6_02_124_bga.h
-endif
-ifeq ($(BOARD), CY8CPROTO-063-BLE)
-PIN_PACKAGE_FILE = cyhal_psoc6_01_116_bga_ble.h #ToDo: Check the right file and replace
-endif
-
 #ToDo: Post adding af functionality, refactor to minimize dependent variables in py script if possible
 GEN_PINS_SRC := ./build/pins_$(BOARD).c
 HEADER_BUILD := ./build/genhdr
@@ -243,7 +236,7 @@ build: mtb_get_build_flags make_pins_csv $(MPY_PATH_TO_MAIN_MAKEFILE) $(MPY_MAIN
 
 all: build
 
-clean: mtb_clean
+#clean: mtb_clean
 
 rebuild: clean mtb_clean all
 
diff --git a/ports/psoc6/boards/CY8CPROTO-062-4343W/mpconfigboard.mk b/ports/psoc6/boards/CY8CPROTO-062-4343W/mpconfigboard.mk
index 6fcdfa5aae6bb..90b328da6657c 100644
--- a/ports/psoc6/boards/CY8CPROTO-062-4343W/mpconfigboard.mk
+++ b/ports/psoc6/boards/CY8CPROTO-062-4343W/mpconfigboard.mk
@@ -6,3 +6,6 @@ MICROPY_PY_SSL = 1
 MICROPY_PSOC6_SSL_MBEDTLS = 1
 MICROPY_PY_EXT_FLASH = 1
 BOARD_VERSION=release-v4.0.0
+
+# Variables to support make-pins
+PIN_PACKAGE_FILE = cyhal_psoc6_02_124_bga.h
diff --git a/ports/psoc6/boards/CY8CPROTO-063-BLE/mpconfigboard.mk b/ports/psoc6/boards/CY8CPROTO-063-BLE/mpconfigboard.mk
index ffcbd6b72ba0b..41af88ae0d058 100644
--- a/ports/psoc6/boards/CY8CPROTO-063-BLE/mpconfigboard.mk
+++ b/ports/psoc6/boards/CY8CPROTO-063-BLE/mpconfigboard.mk
@@ -2,3 +2,6 @@ FROZEN_MANIFEST ?= boards/manifest.py
 MICROPY_PY_SSL = 1
 MICROPY_PSOC6_SSL_MBEDTLS = 1
 BOARD_VERSION=release-v4.2.0
+
+# Variables to support make-pins
+PIN_PACKAGE_FILE = cyhal_psoc6_01_116_bga_ble.h
\ No newline at end of file