diff --git a/.circleci/config.yml b/.circleci/config.yml
index 932a4041..b41ad31c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,27 +310,6 @@ workflows:
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: x230-legacy-flash
-          target: x230-legacy-flash
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-legacy
-          target: x230-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-hotp-legacy
-          target: x230-hotp-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: x230-hotp-maximized_usb-kb
           target: x230-hotp-maximized_usb-kb
diff --git a/Makefile b/Makefile
index 2e0a86bb..1026785a 100644
--- a/Makefile
+++ b/Makefile
@@ -845,6 +845,28 @@ board.move_tested_to_untested:
 	echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
 	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml
 
+board.move_tested_to_unmaintained:
+	@echo "Moving $(BOARD) from tested to unmaintained status"
+	@NEW_BOARD=UNMAINTAINED_$(BOARD); \
+	INCLUDE_BOARD=$$(grep "include \$$(pwd)/boards/" boards/$(BOARD)/$(BOARD).config | sed 's/.*boards\/\(.*\)\/.*/\1/'); \
+	NEW_INCLUDE_BOARD=UNMAINTAINED_$${INCLUDE_BOARD}; \
+	echo "Updating config file: boards/$(BOARD)/$(BOARD).config"; \
+	sed -i 's/$(BOARD)/'$${NEW_BOARD}'/g' boards/$(BOARD)/$(BOARD).config; \
+	if [ -n "$$INCLUDE_BOARD" ]; then \
+		sed -i 's/'$$INCLUDE_BOARD'/'$$NEW_INCLUDE_BOARD'/g' boards/$(BOARD)/$(BOARD).config; \
+	fi; \
+	echo "Creating unmaintained_boards directory if it doesn't exist"; \
+	mkdir -p unmaintained_boards/$${NEW_BOARD}; \
+	echo "Moving and renaming config file to unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config"; \
+	mv boards/$(BOARD)/$(BOARD).config unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config; \
+	echo "Moving board directory contents to unmaintained_boards/$${NEW_BOARD}"; \
+	mv boards/$(BOARD)/* unmaintained_boards/$${NEW_BOARD}/; \
+	rmdir boards/$(BOARD); \
+	echo "Updating .circleci/config.yml"; \
+	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml; \
+	echo "Operation completed for $(BOARD) -> $${NEW_BOARD}"; \
+	echo "Please manually review and remove any unnecessary entries in .circleci/config.yml"
+
 # Inject a GPG key into the image - this is most useful when testing in qemu,
 # since we can't reflash the firmware in qemu to update the keychain.  Instead,
 # inject the public key ahead of time.  Specify the location of the key with
diff --git a/boards/x230-hotp-legacy/x230-hotp-legacy.config b/unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config
similarity index 100%
rename from boards/x230-hotp-legacy/x230-hotp-legacy.config
rename to unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config
diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
similarity index 92%
rename from boards/x230-legacy-flash/x230-legacy-flash.config
rename to unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
index a581fe7b..ed0e7990 100644
--- a/boards/x230-legacy-flash/x230-legacy-flash.config
+++ b/unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy-flash.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy-flash.config
 CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
 
 #Add bare minimal tools for flashing boards
diff --git a/boards/x230-legacy/x230-legacy.config b/unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
similarity index 92%
rename from boards/x230-legacy/x230-legacy.config
rename to unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
index c0999990..bdd82121 100644
--- a/boards/x230-legacy/x230-legacy.config
+++ b/unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
@@ -7,8 +7,8 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy.config
-CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy.config
+CONFIG_LINUX_CONFIG=config/linux-UNMAINTAINED_x230-legacy.config
 
 #Additional hardware support
 CONFIG_LINUX_USB=y