diff --git a/.github/workflows/build-corne-nice_nano.yml b/.github/workflows/build-corne-nice_nano.yml
index 6ddf511..d43f9ce 100644
--- a/.github/workflows/build-corne-nice_nano.yml
+++ b/.github/workflows/build-corne-nice_nano.yml
@@ -77,29 +77,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/build-inputs.yml b/.github/workflows/build-inputs.yml
index 892f6fa..b192ec2 100644
--- a/.github/workflows/build-inputs.yml
+++ b/.github/workflows/build-inputs.yml
@@ -89,29 +89,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/build-matrix-template.yml b/.github/workflows/build-matrix-template.yml
index 3badd34..c6d6f05 100644
--- a/.github/workflows/build-matrix-template.yml
+++ b/.github/workflows/build-matrix-template.yml
@@ -139,29 +139,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/build-tbkmini-nice_nano_v2.yml b/.github/workflows/build-tbkmini-nice_nano_v2.yml
index 018b692..923e302 100644
--- a/.github/workflows/build-tbkmini-nice_nano_v2.yml
+++ b/.github/workflows/build-tbkmini-nice_nano_v2.yml
@@ -77,29 +77,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/test-boards.yml b/.github/workflows/test-boards.yml
index fc4ea03..0b30361 100644
--- a/.github/workflows/test-boards.yml
+++ b/.github/workflows/test-boards.yml
@@ -82,29 +82,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index e77b763..cb009f4 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -81,29 +81,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml
index 538ee9f..473370b 100644
--- a/.github/workflows/test-configs.yml
+++ b/.github/workflows/test-configs.yml
@@ -88,29 +88,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/test-controllers.yml b/.github/workflows/test-controllers.yml
index 6ce1270..120f176 100644
--- a/.github/workflows/test-controllers.yml
+++ b/.github/workflows/test-controllers.yml
@@ -81,29 +81,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/.github/workflows/test-shields.yml b/.github/workflows/test-shields.yml
index 17d4dca..a5af656 100644
--- a/.github/workflows/test-shields.yml
+++ b/.github/workflows/test-shields.yml
@@ -110,29 +110,29 @@ jobs:
           fi
           echo "::set-output name=manifest::$manifest"
 
-          echo "::set-output name=board-config::board-config"
+          echo "::set-output name=outboard::outboard"
 
-          env_file="config/board-configs/$keyboard.env"
+          env_file="config/outboards/$keyboard.env"
           if [ -f "$env_file" ]
           then
             cat "$env_file" >> $GITHUB_ENV
-            echo "::set-output name=has_board_config::true"
+            echo "::set-output name=has_outboard::true"
           fi
-      - name: Checkout board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+      - name: Checkout outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         uses: actions/checkout@v2
         with:
-          repository: ${{ env.board_config_repository }}
-          ref: ${{ env.board_config_ref }}
-          path: ${{ steps.variables.outputs.board-config }}
-      - name: Use board-config
-        if: ${{ steps.variables.outputs.has_board_config == 'true' }}
+          repository: ${{ env.outboard_repository }}
+          ref: ${{ env.outboard_ref }}
+          path: ${{ steps.variables.outputs.outboard }}
+      - name: Use outboard
+        if: ${{ steps.variables.outputs.has_outboard == 'true' }}
         run: |
-          mkdir -p `dirname "config/${{ env.board_config_to }}"`
-          ln -sr ${{ steps.variables.outputs.board-config }}/${{ env.board_config_from }} config/${{ env.board_config_to }}
-          if [ -n "${{ env.board_config_manifestdir }}" ]
+          mkdir -p `dirname "config/${{ env.outboard_to }}"`
+          ln -sr ${{ steps.variables.outputs.outboard }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
+          if [ -n "${{ env.outboard_manifestdir }}" ]
           then
-            cp ${{ steps.variables.outputs.board-config }}/${{ env.board_config_manifestdir }}/west.yml config/
+            cp ${{ steps.variables.outputs.outboard }}/${{ env.outboard_manifestdir }}/west.yml config/
             cat config/west.yml
           fi
       - name: Cache west modules
diff --git a/config/board-configs/absolem.env b/config/board-configs/absolem.env
deleted file mode 100644
index 9234069..0000000
--- a/config/board-configs/absolem.env
+++ /dev/null
@@ -1,5 +0,0 @@
-board_config_repository=mrzealot/zmk-config
-board_config_ref=master
-board_config_from=/
-board_config_to=boards/shields/absolem
-
diff --git a/config/board-configs/ahokore.env b/config/board-configs/ahokore.env
deleted file mode 100644
index b8fe18b..0000000
--- a/config/board-configs/ahokore.env
+++ /dev/null
@@ -1,4 +0,0 @@
-board_config_repository=dezlidezlidezli/ahokore-zmk-config
-board_config_ref=master
-board_config_from=config/boards
-board_config_to=boards
diff --git a/config/board-configs/bastyl.env b/config/board-configs/bastyl.env
deleted file mode 100644
index 00d9fb5..0000000
--- a/config/board-configs/bastyl.env
+++ /dev/null
@@ -1,5 +0,0 @@
-board_config_repository=mseflek/zmk
-board_config_ref=main
-board_config_from=app/boards
-board_config_to=boards
-
diff --git a/config/board-configs/ferris_rev02.env b/config/board-configs/ferris_rev02.env
deleted file mode 100644
index d12b95f..0000000
--- a/config/board-configs/ferris_rev02.env
+++ /dev/null
@@ -1,4 +0,0 @@
-board_config_repository=petejohanson/zmk
-board_config_ref=boards/ferris-02-bling-basics
-board_config_from=app/boards
-board_config_to=boards
diff --git a/config/board-configs/pteron36.env b/config/board-configs/pteron36.env
deleted file mode 100644
index 82c8434..0000000
--- a/config/board-configs/pteron36.env
+++ /dev/null
@@ -1,4 +0,0 @@
-board_config_repository=harshitgoel96/zmk
-board_config_ref=pteron36
-board_config_from=app/boards
-board_config_to=boards
diff --git a/config/board-configs/zaphod.env b/config/board-configs/zaphod.env
deleted file mode 100644
index efd032a..0000000
--- a/config/board-configs/zaphod.env
+++ /dev/null
@@ -1,5 +0,0 @@
-board_config_repository=petejohanson/zaphod-config
-board_config_ref=main
-board_config_from=boards
-board_config_to=boards
-board_config_manifestdir=.
diff --git a/config/outboards/absolem.env b/config/outboards/absolem.env
new file mode 100644
index 0000000..9c7d1f8
--- /dev/null
+++ b/config/outboards/absolem.env
@@ -0,0 +1,5 @@
+outboard_repository=mrzealot/zmk-config
+outboard_ref=master
+outboard_from=/
+outboard_to=boards/shields/absolem
+
diff --git a/config/outboards/ahokore.env b/config/outboards/ahokore.env
new file mode 100644
index 0000000..e62cb3c
--- /dev/null
+++ b/config/outboards/ahokore.env
@@ -0,0 +1,4 @@
+outboard_repository=dezlidezlidezli/ahokore-zmk-config
+outboard_ref=master
+outboard_from=config/boards
+outboard_to=boards
diff --git a/config/outboards/bastyl.env b/config/outboards/bastyl.env
new file mode 100644
index 0000000..1abe56d
--- /dev/null
+++ b/config/outboards/bastyl.env
@@ -0,0 +1,5 @@
+outboard_repository=mseflek/zmk
+outboard_ref=main
+outboard_from=app/boards
+outboard_to=boards
+
diff --git a/config/outboards/ferris_rev02.env b/config/outboards/ferris_rev02.env
new file mode 100644
index 0000000..351b4d4
--- /dev/null
+++ b/config/outboards/ferris_rev02.env
@@ -0,0 +1,4 @@
+outboard_repository=petejohanson/zmk
+outboard_ref=boards/ferris-02-bling-basics
+outboard_from=app/boards
+outboard_to=boards
diff --git a/config/outboards/pteron36.env b/config/outboards/pteron36.env
new file mode 100644
index 0000000..4c20c8d
--- /dev/null
+++ b/config/outboards/pteron36.env
@@ -0,0 +1,4 @@
+outboard_repository=harshitgoel96/zmk
+outboard_ref=pteron36
+outboard_from=app/boards
+outboard_to=boards
diff --git a/config/outboards/zaphod.env b/config/outboards/zaphod.env
new file mode 100644
index 0000000..23cd928
--- /dev/null
+++ b/config/outboards/zaphod.env
@@ -0,0 +1,5 @@
+outboard_repository=petejohanson/zaphod-config
+outboard_ref=main
+outboard_from=boards
+outboard_to=boards
+outboard_manifestdir=.
diff --git a/readme.org b/readme.org
index afa2be1..fde628d 100644
--- a/readme.org
+++ b/readme.org
@@ -31,7 +31,7 @@ Any compatible combination of [[https://github.com/zmkfirmware/zmk/tree/main/app
 
 *** Out of Tree Boards and Shields
 
-Additionally, some out of tree boards and shields are automatically supported by the included GitHub Actions workflows.  See [[./config/board-configs/]].
+Additionally, some out of tree boards and shields are automatically supported by the included GitHub Actions workflows.  See [[./config/outboards/]] for supported out of tree boards and shields.
 
 
 ** Local Builds
@@ -42,19 +42,19 @@ Clone this repo and use for [[https://zmk.dev/docs/development/build-flash#build
 ** GitHub Actions Workflows
 
 
-*** Prebuilt Firmware
-
-Some prebuilt firmware can be downloaded from the repo.  Log in to GitHub, visit the [[https://github.com/manna-harbour/zmk-config/actions][Actions]] tab, select the appropriate workflow, select the latest successful workflow run, select the desired artifact, and unzip the downloaded zip file.
-
-
 *** Inputs
 
 Fork this repo, select the [[https://github.com/manna-harbour/zmk-config/actions/workflows/build-inputs.yml][Build Inputs]] workflow action, select Run workflow, fill out the form with a [[#Supported-Keyboards][supported keyboard]] and [[#configuration-options][configuration options]], activate Run workflow, wait for successful completion, select the workflow run, select the Artifacts, and unzip the downloaded zip file.
 
 
-*** Build Matrix
+*** Build Matrix Template
 
-Fork this repo, copy, rename, and edit the included [[https://github.com/manna-harbour/zmk-config/actions/workflows/build-matrix.yml][Build Matrix workflow]] by commenting and uncommenting the included matrix elements for [[#Supported-Keyboards][supported keyboards]] and [[#configuration-options][configuration options]].  Enable elements from only one of the with shield or without shield sections per file.
+Fork this repo, copy, rename, and edit the included [[https://github.com/manna-harbour/zmk-config/actions/workflows/build-matrix-template.yml][Build Matrix Template workflow]] by uncommenting the included matrix elements for the required [[#Supported-Keyboards][supported keyboards]] and [[#configuration-options][configuration options]].
+
+
+*** Prebuilt Firmware
+
+Some prebuilt firmware can be downloaded from the repo.  Log in to GitHub, visit the [[https://github.com/manna-harbour/zmk-config/actions][Actions]] tab, select the appropriate workflow, select the latest successful workflow run, select the desired artifact, and unzip the downloaded zip file.
 
 
 * Miryoku Keymap