diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8768e9ff4..5cc7243c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,7 +116,6 @@ jobs:
       - store-artifacts:
           path: build/x230
 
-
       - run:
           name: x230-hotp-verification
           command: |
@@ -152,7 +151,25 @@ jobs:
              tar zcvf build/kgpe-d16_workstation/logs.tar.gz build/log/*
       - store-artifacts:
           path: build/kgpe-d16_workstation
-      
+     
+      - run:
+          name: kgpe-d16_workstation-usb_keyboard
+          command: |
+            rm -rf build/kgpe-d16_workstation-usb_keyboard/* build/log/* && make --load 2 \
+                V=1 \
+                BOARD=kgpe-d16_workstation-usb_keyboard \
+          no_output_timeout: 3h
+      - run:
+          name: Ouput kgpe-d16_workstation-usb_keyboard hashes
+          command: |
+            cat build/kgpe-d16_workstation-usb_keyboard/hashes.txt \
+      - run:
+          name: Archiving build logs for kgpe-d16_workstation-usb_keyboard
+          command: |
+             tar zcvf build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/kgpe-d16_workstation-usb_keyboard
+    
       - run:
           name: kgpe-d16_server
           command: |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba5cc349..7464c6512 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,6 +81,15 @@ build:
     - cat ./build/kgpe-d16_workstation/hashes.txt
     - echo "Archiving kgpe-d16_workstation logs..."
     - tar zcvf ./build/kgpe-d16_workstation/logs.tar.gz ./build/log/*
+    - echo "Removing old kgpe-d16_workstation-usb_keyboard artifacts..."
+    - rm -rf ./build/kgpe-d16_workstation-usb_keyboard/*
+    - rm -rf ./build/log/*
+    - echo "Building BOARD=kgpe-d16_workstation-usb_keyboard board..."
+    - make BOARD=kgpe-d16_workstation || (find ./build/log/ -cmin 1|xargs tail; exit 1)
+    - echo "kgpe-d16_workstation-usb_keyboard hashes:"
+    - cat ./build/kgpe-d16_workstation-usb_keyboard/hashes.txt
+    - echo "Archiving kgpe-d16_workstation-usb_keyboard logs..."
+    - tar zcvf ./build/kgpe-d16_workstation-usb_keyboard/logs.tar.gz ./build/log/*
     - echo "Removing old kgpe-d16_server artifacts..."
     - rm -rf ./build/kgpe-d16_server/*
     - rm -rf ./build/log/*
@@ -102,6 +111,9 @@ build:
 
   artifacts:
     paths:
+      - ./build/kgpe-d16_workstation
+      - ./build/kgpe-d16_workstation-usb_keyboard
+      - ./build/kgpe-d16_server
       - ./build/qemu-coreboot
       - ./build/x230-flash
       - ./build/t430-flash
diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
new file mode 100644
index 000000000..3963182f1
--- /dev/null
+++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
@@ -0,0 +1,58 @@
+# Configuration for a kgpe-d16 with USB keyboard support, FBwhiptail on onboard ASpeed GPU
+export CONFIG_COREBOOT=y
+CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
+CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
+
+CONFIG_CRYPTSETUP=y
+CONFIG_FLASHROM=y
+CONFIG_FLASHTOOLS=y
+CONFIG_GPG2=y
+CONFIG_KEXEC=y
+CONFIG_UTIL_LINUX=y
+CONFIG_LVM2=y
+CONFIG_MBEDTLS=y
+CONFIG_PCIUTILS=y
+CONFIG_POPT=y
+CONFIG_QRENCODE=y
+CONFIG_TPMTOTP=y
+CONFIG_DROPBEAR=y
+
+#Whiptail
+#CONFIG_SLANG=y
+#CONFIG_NEWT=y
+#FBWhiptail
+CONFIG_CAIRO=y
+CONFIG_FBWHIPTAIL=y
+
+CONFIG_LINUX_USB=y
+CONFIG_LINUX_E1000E=y
+export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
+
+#Enable USB Keyboard support
+export CONFIG_USB_KEYBOARD=y
+#No TPM support for the moment
+export CONFIG_TPM=n
+#BOOT SCRIPT SELECTION
+#export CONFIG_BOOTSCRIPT=/bin/generic-init
+export CONFIG_BOOTSCRIPT=/bin/gui-init
+#export CONFIG_BOOTSCRIPT_NETWORK=/bin/network-init-recovery
+export CONFIG_BOOT_GUI_MENU_NAME="KGPE-D16 Heads Boot Menu"
+export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
+export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
+
+#CONSOLE SELECTION
+#Single output to OpenBMC
+#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 "
+#Dual output to local console (tty0) and OpenBmc (ttyS1)
+#export CONFIG_BOOT_KERNEL_ADD="nohz=on console=ttyS1,115200n8 console=tty0"
+#Single output to tty0
+export CONFIG_BOOT_KERNEL_ADD="nohz=on console=tty0"
+#export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
+#export CONFIG_BOOT_STATIC_IP=192.168.2.3
+
+export CONFIG_BOOT_REQ_HASH=n
+export CONFIG_BOOT_REQ_ROLLBACK=n
+export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_USB_BOOT_DEV="/dev/sdb1"
+export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
diff --git a/config/coreboot-kgpe-d16_workstation-usb_keyboard.config b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
new file mode 100644
index 000000000..ebb4b5f8f
--- /dev/null
+++ b/config/coreboot-kgpe-d16_workstation-usb_keyboard.config
@@ -0,0 +1,16 @@
+CONFIG_LOCALVERSION="heads"
+CONFIG_ANY_TOOLCHAIN=y
+CONFIG_USE_OPTION_TABLE=y
+# CONFIG_COLLECT_TIMESTAMPS is not set
+CONFIG_VENDOR_ASUS=y
+CONFIG_UART_FOR_CONSOLE=1
+CONFIG_BOARD_ASUS_KGPE_D16=y
+CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_SOUTHBRIDGE_AMD_SB700_33MHZ_SPI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_PAYLOAD_LINUX=y
+CONFIG_PAYLOAD_FILE="../../build/kgpe-d16_workstation-usb_keyboard/bzImage"
+CONFIG_LINUX_COMMAND_LINE="nohz=on console=tty0 earlyprintk=tty0"
+CONFIG_LINUX_INITRD="../../build/kgpe-d16_workstation-usb_keyboard/initrd.cpio.xz"