diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml
index b3027ec..a7f74c0 100644
--- a/.github/workflows/package-pr.yaml
+++ b/.github/workflows/package-pr.yaml
@@ -55,7 +55,9 @@ jobs:
         run: |
           PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u)
           echo "Packages: $PACKAGES"
-          docker run -v "${{ github.workspace }}:/piston" docker.pkg.github.com/engineer-man/piston/repo-builder:latest --no-server $PACKAGES
+          docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
+          docker build -t repo-builder repo
+          docker run -v "${{ github.workspace }}:/piston" repo-builder --no-server $PACKAGES
           ls -la packages
 
       - name: Upload package as artifact
diff --git a/.github/workflows/package-push.yaml b/.github/workflows/package-push.yaml
index ad33f3e..bbb44af 100644
--- a/.github/workflows/package-push.yaml
+++ b/.github/workflows/package-push.yaml
@@ -33,7 +33,9 @@ jobs:
         run: |
           PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u)
           echo "Packages: $PACKAGES"
-          docker run -v "${{ github.workspace }}:/piston" docker.pkg.github.com/engineer-man/piston/repo-builder:latest --no-server $PACKAGES
+          docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
+          docker build -t repo-builder repo
+          docker run -v "${{ github.workspace }}:/piston" repo-builder --no-server $PACKAGES
           ls -la packages
 
       - name: Upload Packages
@@ -73,4 +75,4 @@ jobs:
           file: index
           tag: pkgs
           overwrite: true
-          file_glob: true
\ No newline at end of file
+          file_glob: true