diff --git a/config/outboards/ahokore.env b/config/outboards/ahokore.env
index e62cb3c..a7ea2a4 100644
--- a/config/outboards/ahokore.env
+++ b/config/outboards/ahokore.env
@@ -1,4 +1,4 @@
 outboard_repository=dezlidezlidezli/ahokore-zmk-config
 outboard_ref=master
-outboard_from=config/boards
-outboard_to=boards
+outboard_from=config/boards/arm/ahokore
+outboard_to=boards/arm/ahokore
diff --git a/config/outboards/bastyl.env b/config/outboards/bastyl.env
index 1abe56d..00a5c41 100644
--- a/config/outboards/bastyl.env
+++ b/config/outboards/bastyl.env
@@ -1,5 +1,5 @@
 outboard_repository=mseflek/zmk
 outboard_ref=main
-outboard_from=app/boards
-outboard_to=boards
+outboard_from=app/boards/shields/bastyl
+outboard_to=boards/shields/bastyl
 
diff --git a/config/outboards/ferris_rev02.env b/config/outboards/ferris_rev02.env
index 351b4d4..9bbcd1d 100644
--- a/config/outboards/ferris_rev02.env
+++ b/config/outboards/ferris_rev02.env
@@ -1,4 +1,4 @@
 outboard_repository=petejohanson/zmk
 outboard_ref=boards/ferris-02-bling-basics
-outboard_from=app/boards
-outboard_to=boards
+outboard_from=app/boards/arm/ferris
+outboard_to=boards/arm/ferris
diff --git a/config/outboards/pteron36.env b/config/outboards/pteron36.env
index 4c20c8d..0845d94 100644
--- a/config/outboards/pteron36.env
+++ b/config/outboards/pteron36.env
@@ -1,4 +1,4 @@
 outboard_repository=harshitgoel96/zmk
 outboard_ref=pteron36
-outboard_from=app/boards
-outboard_to=boards
+outboard_from=app/boards/shields/pteron36
+outboard_to=boards/shields/pteron36
diff --git a/config/outboards/zaphod.env b/config/outboards/zaphod.env
index 23cd928..a41e497 100644
--- a/config/outboards/zaphod.env
+++ b/config/outboards/zaphod.env
@@ -1,5 +1,5 @@
 outboard_repository=petejohanson/zaphod-config
 outboard_ref=main
-outboard_from=boards
-outboard_to=boards
+outboard_from=boards/arm/zaphod
+outboard_to=boards/arm/zaphod
 outboard_manifestdir=.