diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index de85791a..0b42f23a 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -79,22 +79,26 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build Frappe
+      - name: Build Frappe and push to local registry
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
-          targets: frappe-develop-test
-          # load: true
+          targets: frappe-develop-test-localhost
           push: true
 
-      - run: docker image ls -a
       - name: Build ERPNext
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
           targets: erpnext-develop-test
-          push: true
-          # load: true
+          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
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 465c1193..c662fca9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -81,11 +81,16 @@ target "test-erpnext-args" {
     }
 }
 
-function "set_test_tags" {
+function "set_localhost_test_tags" {
     params = [repo]
     result = ["localhost:5000/${repo}:test"]
 }
 
+function "set_default_test_tags" {
+    params = [repo]
+    result = ["${repo}:test"]
+}
+
 
 # Develop images
 
@@ -124,6 +129,21 @@ group "erpnext-develop" {
 
 # Test develop images
 
+target "frappe-nginx-develop-test-localhost" {
+    inherits = ["frappe-nginx-develop"]
+    tags = set_localhost_test_tags("frappe/frappe-nginx")
+}
+
+target "frappe-worker-develop-test-localhost" {
+    inherits = ["frappe-worker-develop"]
+    tags = set_localhost_test_tags("frappe/frappe-worker")
+}
+
+target "frappe-socketio-develop-test-localhost" {
+    inherits = ["frappe-socketio-develop"]
+    tags = set_localhost_test_tags("frappe/frappe-socketio")
+}
+
 target "frappe-nginx-develop-test" {
     inherits = ["frappe-nginx-develop"]
     tags = set_test_tags("frappe/frappe-nginx")
@@ -149,6 +169,10 @@ 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" {
     targets = ["frappe-nginx-develop-test", "frappe-worker-develop-test", "frappe-socketio-develop-test"]
 }