diff --git a/.github/actions/build-kotsadm-image/action.yml b/.github/actions/build-kotsadm-image/action.yml
index 7a3d454a97..2572fcbc68 100644
--- a/.github/actions/build-kotsadm-image/action.yml
+++ b/.github/actions/build-kotsadm-image/action.yml
@@ -10,13 +10,13 @@ runs:
   steps:
     - uses: chainguard-dev/actions/melange-build@main
       with:
-        config: melange.yaml
+        config: deploy/melange.yaml
         archs: x86_64
         sign-with-temporary-key: true
 
     - uses: chainguard-images/actions/apko-publish@main
       with:
-        config: apko.yaml
+        config: deploy/apko.yaml
         archs: x86_64
         tag: ${{ inputs.image-name }}
         vcs-url: true
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index ee892b4a50..a44b99beb9 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -559,7 +559,7 @@ jobs:
 
   validate-existing-online-install-minimal:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -592,7 +592,7 @@ jobs:
 
   validate-smoke-test:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -633,7 +633,7 @@ jobs:
 
   validate-minimal-rbac:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -674,7 +674,7 @@ jobs:
 
   validate-backup-and-restore:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -715,7 +715,7 @@ jobs:
 
   validate-no-required-config:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -753,7 +753,7 @@ jobs:
 
   validate-strict-preflight-checks:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -791,7 +791,7 @@ jobs:
 
   validate-config:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -829,7 +829,7 @@ jobs:
 
   validate-version-history-pagination:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -866,7 +866,7 @@ jobs:
 
   validate-change-license:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -904,7 +904,7 @@ jobs:
 
   validate-minimal-rbac-override:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1005,7 +1005,7 @@ jobs:
 
   validate-multi-namespace:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1114,7 +1114,7 @@ jobs:
 
   validate-gke-install:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-kots, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     env:
       APP_SLUG: helm-install-order
     steps:
@@ -1195,7 +1195,7 @@ jobs:
 
   validate-kots-pull:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1302,7 +1302,7 @@ jobs:
 
   validate-app-version-label:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1454,7 +1454,7 @@ jobs:
 
   validate-helm-install-order:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1549,7 +1549,7 @@ jobs:
 
   validate-yamlescape:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1644,7 +1644,7 @@ jobs:
 
   validate-no-redeploy-on-restart:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1760,7 +1760,7 @@ jobs:
 
   validate-kubernetes-installer-preflight:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1891,7 +1891,7 @@ jobs:
 
   validate-tag-and-digest:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -1929,7 +1929,7 @@ jobs:
 
   validate-kots-push-images-anonymous:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -1950,7 +1950,7 @@ jobs:
 
   validate-kots-admin-console-generate-manifests:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2339,7 +2339,7 @@ jobs:
 
   validate-kots-upgrade:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2475,7 +2475,7 @@ jobs:
 
   validate-kots-helm-release-secret-migration:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2656,7 +2656,7 @@ jobs:
 
   validate-multi-app-backup-and-restore:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2693,7 +2693,7 @@ jobs:
 
   validate-multi-app-install:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2731,7 +2731,7 @@ jobs:
 
   validate-airgap-smoke-test:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2770,7 +2770,7 @@ jobs:
 
   validate-remove-app:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -2942,7 +2942,7 @@ jobs:
 
   validate-registry-check:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -3036,7 +3036,7 @@ jobs:
 
   validate-native-helm-v2:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
@@ -3230,7 +3230,7 @@ jobs:
 
   validate-deployment-orchestration:
     runs-on: ubuntu-20.04
-    needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
+    needs: [ enable-tests, can-run-ci, build-kots, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
     strategy:
       fail-fast: false
       matrix:
diff --git a/apko.yaml b/deploy/apko.yaml
similarity index 100%
rename from apko.yaml
rename to deploy/apko.yaml
diff --git a/apko_melange_build.md b/deploy/apko_melange_build.md
similarity index 92%
rename from apko_melange_build.md
rename to deploy/apko_melange_build.md
index 8500380abb..c67583f632 100644
--- a/apko_melange_build.md
+++ b/deploy/apko_melange_build.md
@@ -44,7 +44,7 @@ docker run $(apko publish ...)
 
 ### Presubmit GitHub Actions
 
-The above steps are automated in [GitHub Actions](./.github/workflows/presubmit-image.yaml) as a presubmit check for PRs.
+The above steps are automated in [GitHub Actions](./.github/actions/build-kotsadm-image/action.yml) as a presubmit check for PRs.
 
 The image this workflow produces is only meant for validation, and not meant for production use cases at this time.
 
diff --git a/melange.yaml b/deploy/melange.yaml
similarity index 100%
rename from melange.yaml
rename to deploy/melange.yaml