diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index ec367b5..987de65 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -32,7 +32,9 @@ jobs:
 
     - name: Enable Experimental Pack Features
       run: |
-        pack config experimental true
+        if [ -f "scripts/options.json" ] && jq -e -r .pack_config_enable_experimental "scripts/options.json" > /dev/null; then
+          pack config experimental true
+        fi
 
     - name: Create Builder Image
       run: |
@@ -42,8 +44,9 @@ jobs:
       env:
         PAKETO_BUILDPACKS_DOCKERHUB_USERNAME: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}
         PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }}
-        DOCKERHUB_ORG: "paketocommunity"
+        GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
       run: |
+        DOCKERHUB_ORG="${GITHUB_REPOSITORY_OWNER/-/}" # translates 'paketo-buildpacks' to 'paketobuildpacks'
         # Strip off the Github org prefix from repo name
         # paketo-buildpacks/builder-with-some-name --> builder-with-some-name
         registry_repo=$(echo "${{ github.repository }}" | sed 's/^.*\///')
diff --git a/scripts/options.json b/scripts/options.json
deleted file mode 100644
index 89ee79c..0000000
--- a/scripts/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "pack_config_enable_experimental": true
-}