diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a71225c..0db49692 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -546,29 +546,29 @@ workflows:
 
       # coreboot fam15h
       - build:
-          name: UNMAINTAINED_kgpe-d16_workstation
-          target: UNMAINTAINED_kgpe-d16_workstation
+          name: kgpe-d16_workstation
+          target: kgpe-d16_workstation
           subcommand: ""
           requires:
             - x86-musl-cross-make
 
       - build:
-          name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
-          target: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
+          name: kgpe-d16_workstation-usb_keyboard
+          target: kgpe-d16_workstation-usb_keyboard
           subcommand: ""
           requires:
-            - UNMAINTAINED_kgpe-d16_workstation
+            - kgpe-d16_workstation
 
       - build:
           name: UNMAINTAINED_kgpe-d16_server
           target: UNMAINTAINED_kgpe-d16_server
           subcommand: ""
           requires:
-            - UNMAINTAINED_kgpe-d16_workstation
+            - kgpe-d16_workstation
 
       - build:
           name: UNMAINTAINED_kgpe-d16_server-whiptail
           target: UNMAINTAINED_kgpe-d16_server-whiptail
           subcommand: ""
           requires:
-            - UNMAINTAINED_kgpe-d16_workstation
+            - kgpe-d16_workstation
diff --git a/BOARD_TESTERS.md b/BOARD_TESTERS.md
index a86798b0..02f8ee15 100644
--- a/BOARD_TESTERS.md
+++ b/BOARD_TESTERS.md
@@ -54,7 +54,7 @@ Clevo:
 
 Desktops/Servers
 ==
-- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12): @arhabd @Tonux599 @zifxify https://matrix.to/#/@rsabdpy:matrix.org
+- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12: brought back in 15h fork): @arhabd @zifxify https://matrix.to/#/@rsabdpy:matrix.org
 - [ ] Librem L1UM v1 (Broadwell): @JonathonHall-Purism
 - [ ] Librem L1Um v2 (CoffeeLake): @JonathonHall-Purism
 - [ ] Talos II (PPC64LE, Power9) : @tlaurion (Will become untested, no other known users, not worth my time nor effort even though massive investment of all forms)
diff --git a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
similarity index 100%
rename from boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
rename to boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
diff --git a/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
similarity index 100%
rename from boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
rename to boards/kgpe-d16_workstation/kgpe-d16_workstation.config