diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
index a2f35bf5a51..c7e96156f2f 100644
--- a/.github/workflows/build-publish-develop-pr.yml
+++ b/.github/workflows/build-publish-develop-pr.yml
@@ -30,29 +30,11 @@ env:
 
 jobs:
   image-tag:
-    permissions:
-      id-token: write
-      contents: read
     runs-on: ubuntu-latest
     outputs:
       image-tag: ${{ steps.get-image-tag.outputs.image-tag }}
       release-type: ${{ steps.get-image-tag.outputs.release-type }}
     steps:
-      - name: Setup Github Token
-        id: token
-        uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1
-        with:
-          aws-role-arn: ${{ secrets.AWS_OIDC_GLOBAL_READ_ONLY_TOKEN_ISSUER_ROLE_ARN }}
-          aws-lambda-url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
-          aws-region: ${{ secrets.AWS_REGION }}
-          set-git-config: "true"
-
-      - name: Checkout capabilities repository
-        uses: actions/checkout@v4.2.1
-        with:
-          repository: smartcontractkit/capabilities
-          token: ${{ steps.token.outputs.access-token }}
-
       - name: Checkout chainlink repository
         uses: actions/checkout@v4.2.1
         with:
@@ -102,10 +84,28 @@ jobs:
             goarch: arm64
             dist_name: linux_arm64_v8.0
     steps:
-      - name: Checkout repository
+      - name: Setup Github Token
+        id: token
+        uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1
+        with:
+          aws-role-arn: ${{ secrets.AWS_OIDC_GLOBAL_READ_ONLY_TOKEN_ISSUER_ROLE_ARN }}
+          aws-lambda-url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
+          aws-region: ${{ secrets.AWS_REGION }}
+          set-git-config: "true"
+
+      - name: Checkout capabilities repository
         uses: actions/checkout@v4.2.1
         with:
+          repository: smartcontractkit/capabilities
+          token: ${{ steps.token.outputs.access-token }}
+          path: capabilities
+
+      - name: Checkout chainlink repository
+        uses: actions/checkout@v4.2.1
+        with:
+          repository: smartcontractkit/chainlink
           ref: ${{ env.CHECKOUT_REF }}
+          path: chainlink
           fetch-depth: 0
 
       - name: Configure aws credentials
@@ -125,6 +125,7 @@ jobs:
       - name: Build images for ${{ matrix.goarch }}
         uses: ./.github/actions/goreleaser-build-sign-publish
         if: github.event_name == 'workflow_dispatch' || steps.cache.outputs.cache-hit != 'true'
+        working-directory: chainlink
         with:
           docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
           docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
diff --git a/tools/bin/goreleaser_utils b/tools/bin/goreleaser_utils
index 65db3168537..2c5c4f302e3 100755
--- a/tools/bin/goreleaser_utils
+++ b/tools/bin/goreleaser_utils
@@ -6,9 +6,6 @@ set -xe
 before_hook() {
   local -r lib_path=tmp
 
-  echo $(ls)
-  echo $(ls ..)
-
   mkdir -p "$lib_path/libs"
   # Copy over all platform versions of the wasmvm library
   cp -f "$(go list -json -m github.com/CosmWasm/wasmvm | jq -r '.Dir')"/internal/api/libwasmvm.* "$lib_path/libs"
@@ -74,7 +71,19 @@ get_remote_plugin_paths() {
   done
 }
 
+build_standard_capabilities() {
+  ls ../
+  ls ../..
+  ls ../../..
+  ls ../../../..
+  cd ../capabilities/cron
+  # go install "${ldflags[@]}" .
+  # cd ../chainlink
+}
+
 install_remote_plugins() {
+  build_standard_capabilities
+
   ldflags=(-ldflags "$(./tools/bin/ldflags)")
 
   for plugin in $(get_remote_plugin_paths); do
diff --git a/tools/goreleaser-config/gen_config.go b/tools/goreleaser-config/gen_config.go
index dd997a35938..de0a4ef0c3c 100644
--- a/tools/goreleaser-config/gen_config.go
+++ b/tools/goreleaser-config/gen_config.go
@@ -25,7 +25,7 @@ func Generate(environment string) config.Project {
 					Cmd: "go mod tidy",
 				},
 				{
-					Cmd: "./tools/bin/goreleaser_utils before_hook", // modify this to include capabilities
+					Cmd: "./tools/bin/goreleaser_utils before_hook",
 				},
 			},
 		},