diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index a036e63..8a7df31 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -8,9 +8,56 @@ on:
       - 'v*'
   pull_request:
 
+env:
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
+
 jobs:
+  build-docker_cache-container:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      # Checkout push-to-registry action GitHub repository
+      - name: Checkout Push to Registry action
+        uses: actions/checkout@v4
+
+       # Build image using Buildah action
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          containerfiles: |
+            ./Containerfile
+          image: docker_cache
+
+      - name: Lowercase Registry
+        id: registry_case
+        uses: ASzc/change-string-case-action@v6
+        with:
+          string: ${{ env.IMAGE_REGISTRY }}
+
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        if: github.event_name != 'pull_request'
+        env:
+          REGISTRY_USER: ${{ github.actor }}
+          REGISTRY_PASSWORD: ${{ github.token }}
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: latest
+          registry: ${{ steps.registry_case.outputs.lowercase }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+          extra-args: |
+            --disable-content-trust
+
   build-and-push-iso:
     runs-on: ubuntu-latest
+    needs:
+      - build-docker_cache-container
     container:
       image: fedora:39
       options: "--privileged"
@@ -18,7 +65,7 @@ jobs:
         - registry_cache:/registry_cache
     services:
       dockerregistry:
-        image: docker.io/library/registry:2
+        image: ${{ steps.registry_case.outputs.lowercase }}/docker_cache:latest
         ports:
           - 5000:5000
         volumes:
diff --git a/containers/docker_cache/Containerfile b/containers/docker_cache/Containerfile
new file mode 100644
index 0000000..86100a7
--- /dev/null
+++ b/containers/docker_cache/Containerfile
@@ -0,0 +1,3 @@
+FROM docker.io/library/registry:2
+
+ADD config.yml /etc/docker/registry/config.yml
\ No newline at end of file
diff --git a/iso_files/registry/config.yml b/containers/docker_cache/config.yml
similarity index 100%
rename from iso_files/registry/config.yml
rename to containers/docker_cache/config.yml
diff --git a/iso_files/kickstart.ks b/iso_files/kickstart.ks
deleted file mode 100644
index fd10715..0000000
--- a/iso_files/kickstart.ks
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set source image
-ostreecontainer --url=ghcr.io/ublue-os/base-main:39
\ No newline at end of file