diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8621da6c..81720791 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
 
     - name: create checksum
       run: |
-        cd utilities/pi-gen/pi-gen/deploy
+        cd utilities/build/pi-gen/deploy
         export image_filename=$(ls *-img.xz)
         sha256sum ${image_filename} > ${image_filename}.sha256sum
 
@@ -37,8 +37,8 @@ jobs:
       with:
         name: ${{ steps.build.outputs.version }}
         path: |
-          utilities/pi-gen/pi-gen/deploy/*.img.xz
-          utilities/pi-gen/pi-gen/deploy/*.img.xz.sha256sum
+          utilities/build/pi-gen/deploy/*.img.xz
+          utilities/build/pi-gen/deploy/*.img.xz.sha256sum
         compression-level: 0
 
     - name: create release
@@ -46,6 +46,6 @@ jobs:
       with:
         tag_name: v${{ steps.build.outputs.version }}
         files: |
-          utilities/pi-gen/pi-gen/deploy/*.img.xz
-          utiliries/pi-gen/pi-gen/deploy/*.img.xz.sha256sum
+          utilities/build/pi-gen/deploy/*.img.xz
+          utiliries/build/pi-gen/deploy/*.img.xz.sha256sum
         generate_release_notes: true
diff --git a/utilities/build/.gitignore b/utilities/build/.gitignore
new file mode 100644
index 00000000..5795f2c8
--- /dev/null
+++ b/utilities/build/.gitignore
@@ -0,0 +1 @@
+pi-gen
diff --git a/utilities/pi-gen/build-image.sh b/utilities/build/build-image.sh
similarity index 95%
rename from utilities/pi-gen/build-image.sh
rename to utilities/build/build-image.sh
index 9d2348ba..0d74694b 100755
--- a/utilities/pi-gen/build-image.sh
+++ b/utilities/build/build-image.sh
@@ -25,7 +25,7 @@ echo "updating config"; {
   GIT_REV=${GITHUB_SHA:-HEAD}
   export VERSION=1.1-$(git rev-parse --short $GIT_REV)
   cp -r stage-solar pi-gen/stage-solar
-  rm -rf stage2/EXPORT_IMAGE
+  rm -rf pi-gen/stage2/EXPORT_IMAGE
   envsubst < config.template > pi-gen/config
 }
 
diff --git a/utilities/pi-gen/config.template b/utilities/build/config.template
similarity index 100%
rename from utilities/pi-gen/config.template
rename to utilities/build/config.template
diff --git a/utilities/pi-gen/installation.md b/utilities/build/installation.md
similarity index 100%
rename from utilities/pi-gen/installation.md
rename to utilities/build/installation.md
diff --git a/utilities/pi-gen/readme.md b/utilities/build/readme.md
similarity index 100%
rename from utilities/pi-gen/readme.md
rename to utilities/build/readme.md
diff --git a/utilities/pi-gen/stage-solar/00-install-solar-protocol/00-packages b/utilities/build/stage-solar/00-install-solar-protocol/00-packages
similarity index 100%
rename from utilities/pi-gen/stage-solar/00-install-solar-protocol/00-packages
rename to utilities/build/stage-solar/00-install-solar-protocol/00-packages
diff --git a/utilities/pi-gen/stage-solar/00-install-solar-protocol/01-run.sh b/utilities/build/stage-solar/00-install-solar-protocol/01-run.sh
similarity index 100%
rename from utilities/pi-gen/stage-solar/00-install-solar-protocol/01-run.sh
rename to utilities/build/stage-solar/00-install-solar-protocol/01-run.sh
diff --git a/utilities/pi-gen/stage-solar/00-install-solar-protocol/files/10-hello.template b/utilities/build/stage-solar/00-install-solar-protocol/files/10-hello.template
similarity index 100%
rename from utilities/pi-gen/stage-solar/00-install-solar-protocol/files/10-hello.template
rename to utilities/build/stage-solar/00-install-solar-protocol/files/10-hello.template
diff --git a/utilities/pi-gen/stage-solar/00-install-solar-protocol/files/20-warning.template b/utilities/build/stage-solar/00-install-solar-protocol/files/20-warning.template
similarity index 100%
rename from utilities/pi-gen/stage-solar/00-install-solar-protocol/files/20-warning.template
rename to utilities/build/stage-solar/00-install-solar-protocol/files/20-warning.template
diff --git a/utilities/pi-gen/stage-solar/EXPORT_IMAGE b/utilities/build/stage-solar/EXPORT_IMAGE
similarity index 100%
rename from utilities/pi-gen/stage-solar/EXPORT_IMAGE
rename to utilities/build/stage-solar/EXPORT_IMAGE
diff --git a/utilities/pi-gen/stage-solar/prerun.sh b/utilities/build/stage-solar/prerun.sh
similarity index 100%
rename from utilities/pi-gen/stage-solar/prerun.sh
rename to utilities/build/stage-solar/prerun.sh
diff --git a/utilities/pi-gen/troubleshooting.md b/utilities/build/troubleshooting.md
similarity index 100%
rename from utilities/pi-gen/troubleshooting.md
rename to utilities/build/troubleshooting.md