diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index 0b42f23a..273779f9 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -79,13 +79,23 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build Frappe and push to local registry
+      - name: Build Frappe
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
-          targets: frappe-develop-test-localhost
+          targets: frappe-develop-test
+          load: true
+
+      - name: Push Frappe to local registry
+        uses: docker/bake-action@v1.6.0
+        with:
+          files: docker-bake.hcl
+          targets: frappe-develop-test-local
           push: true
 
+      - name: Test Frappe
+        run: ./tests/test-frappe.sh
+
       - name: Build ERPNext
         uses: docker/bake-action@v1.6.0
         with:
@@ -93,16 +103,6 @@ jobs:
           targets: erpnext-develop-test
           load: true
 
-      - name: Load Frappe
-        uses: docker/bake-action@v1.6.0
-        with:
-          files: docker-bake.hcl
-          targets: frappe-develop-test
-          load: true
-
-      - name: Test Frappe
-        run: ./tests/test-frappe.sh
-
       - name: Test ERPNext
         run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index a856d4b1..85a14c28 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -81,7 +81,7 @@ target "test-erpnext-args" {
     }
 }
 
-function "set_localhost_test_tags" {
+function "set_local_test_tags" {
     params = [repo]
     result = ["localhost:5000/${repo}:test"]
 }
@@ -129,19 +129,19 @@ group "erpnext-develop" {
 
 # Test develop images
 
-target "frappe-nginx-develop-test-localhost" {
+target "frappe-nginx-develop-test-local" {
     inherits = ["frappe-nginx-develop"]
-    tags = set_localhost_test_tags("frappe/frappe-nginx")
+    tags = set_local_test_tags("frappe/frappe-nginx")
 }
 
-target "frappe-worker-develop-test-localhost" {
+target "frappe-worker-develop-test-local" {
     inherits = ["frappe-worker-develop"]
-    tags = set_localhost_test_tags("frappe/frappe-worker")
+    tags = set_local_test_tags("frappe/frappe-worker")
 }
 
-target "frappe-socketio-develop-test-localhost" {
+target "frappe-socketio-develop-test-local" {
     inherits = ["frappe-socketio-develop"]
-    tags = set_localhost_test_tags("frappe/frappe-socketio")
+    tags = set_local_test_tags("frappe/frappe-socketio")
 }
 
 target "frappe-nginx-develop-test" {
@@ -169,8 +169,8 @@ target "erpnext-worker-develop-test" {
     tags = set_test_tags("frappe/erpnext-worker")
 }
 
-group "frappe-develop-test-localhost" {
-    targets = ["frappe-nginx-develop-test-localhost", "frappe-worker-develop-test-localhost", "frappe-socketio-develop-test-localhost"]
+group "frappe-develop-test-local" {
+    targets = ["frappe-nginx-develop-test-local", "frappe-worker-develop-test-local", "frappe-socketio-develop-test-local"]
 }
 
 group "frappe-develop-test" {