diff --git a/apps/openchallenges/api-gateway/project.json b/apps/openchallenges/api-gateway/project.json
index 69fba685ff..4efd0fe3fe 100644
--- a/apps/openchallenges/api-gateway/project.json
+++ b/apps/openchallenges/api-gateway/project.json
@@ -60,9 +60,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "apps/openchallenges/api-gateway"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/auth-service/project.json b/apps/openchallenges/auth-service/project.json
index a680b0e3b0..cd07ad75d0 100644
--- a/apps/openchallenges/auth-service/project.json
+++ b/apps/openchallenges/auth-service/project.json
@@ -59,14 +59,14 @@
         "cwd": "apps/openchallenges/auth-service"
       },
       "dependsOn": []
-    },
-    "build-image": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
-      "options": {
-        "root": "apps/openchallenges/auth-service"
-      },
-      "dependsOn": ["^install"]
     }
+    // "build-image": {
+    //   "executor": "@nxrocks/nx-spring-boot:build-image",
+    //   "options": {
+    //     "root": "apps/openchallenges/auth-service"
+    //   },
+    //   "dependsOn": ["^install"]
+    // }
   },
   "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"],
   "implicitDependencies": [
diff --git a/apps/openchallenges/challenge-service/project.json b/apps/openchallenges/challenge-service/project.json
index fbd293edfb..cba3e35146 100644
--- a/apps/openchallenges/challenge-service/project.json
+++ b/apps/openchallenges/challenge-service/project.json
@@ -82,9 +82,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "{projectRoot}"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/challenge-to-elasticsearch-service/project.json b/apps/openchallenges/challenge-to-elasticsearch-service/project.json
index 7c52208627..fc7c3ba05a 100644
--- a/apps/openchallenges/challenge-to-elasticsearch-service/project.json
+++ b/apps/openchallenges/challenge-to-elasticsearch-service/project.json
@@ -65,13 +65,13 @@
       },
       "dependsOn": []
     },
-    "build-image": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
-      "options": {
-        "root": "apps/openchallenges/challenge-to-elasticsearch-service"
-      },
-      "dependsOn": ["^install"]
-    },
+    // "build-image": {
+    //   "executor": "@nxrocks/nx-spring-boot:build-image",
+    //   "options": {
+    //     "root": "apps/openchallenges/challenge-to-elasticsearch-service"
+    //   },
+    //   "dependsOn": ["^install"]
+    // },
     "generate": {
       "executor": "nx:run-commands",
       "options": {
diff --git a/apps/openchallenges/config-server/project.json b/apps/openchallenges/config-server/project.json
index b0e861725b..7f85a9594e 100644
--- a/apps/openchallenges/config-server/project.json
+++ b/apps/openchallenges/config-server/project.json
@@ -74,9 +74,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "apps/openchallenges/config-server"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/core-service/project.json b/apps/openchallenges/core-service/project.json
index 92504e55a8..a1233f3d7b 100644
--- a/apps/openchallenges/core-service/project.json
+++ b/apps/openchallenges/core-service/project.json
@@ -50,14 +50,14 @@
         "cwd": "apps/openchallenges/core-service"
       },
       "dependsOn": []
-    },
-    "build-image": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
-      "options": {
-        "root": "apps/openchallenges/core-service"
-      },
-      "dependsOn": ["^install"]
     }
+    // "build-image": {
+    //   "executor": "@nxrocks/nx-spring-boot:build-image",
+    //   "options": {
+    //     "root": "apps/openchallenges/core-service"
+    //   },
+    //   "dependsOn": ["^install"]
+    // }
   },
   "tags": ["type:service", "scope:backend", "language:java", "package-manager:gradle"],
   "implicitDependencies": [
diff --git a/apps/openchallenges/image-service/project.json b/apps/openchallenges/image-service/project.json
index 1efdd6b394..5f3a32ad42 100644
--- a/apps/openchallenges/image-service/project.json
+++ b/apps/openchallenges/image-service/project.json
@@ -85,9 +85,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "apps/openchallenges/image-service"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/kaggle-to-kafka-service/project.json b/apps/openchallenges/kaggle-to-kafka-service/project.json
index 3903ea2601..a8f6f7b866 100644
--- a/apps/openchallenges/kaggle-to-kafka-service/project.json
+++ b/apps/openchallenges/kaggle-to-kafka-service/project.json
@@ -65,13 +65,13 @@
       },
       "dependsOn": []
     },
-    "build-image": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
-      "options": {
-        "root": "apps/openchallenges/kaggle-to-kafka-service"
-      },
-      "dependsOn": ["^install"]
-    },
+    // "build-image": {
+    //   "executor": "@nxrocks/nx-spring-boot:build-image",
+    //   "options": {
+    //     "root": "apps/openchallenges/kaggle-to-kafka-service"
+    //   },
+    //   "dependsOn": ["^install"]
+    // },
     "generate": {
       "executor": "nx:run-commands",
       "options": {
diff --git a/apps/openchallenges/organization-service/project.json b/apps/openchallenges/organization-service/project.json
index 561ea02378..fed2bcedc9 100644
--- a/apps/openchallenges/organization-service/project.json
+++ b/apps/openchallenges/organization-service/project.json
@@ -85,9 +85,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "{projectRoot}"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/service-registry/project.json b/apps/openchallenges/service-registry/project.json
index 84b31fcf46..616ff987ce 100644
--- a/apps/openchallenges/service-registry/project.json
+++ b/apps/openchallenges/service-registry/project.json
@@ -60,9 +60,10 @@
       "dependsOn": []
     },
     "build-image-base": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
+      "executor": "nx:run-commands",
       "options": {
-        "root": "apps/openchallenges/service-registry"
+        "command": "./gradlew bootBuildImage",
+        "cwd": "{projectRoot}"
       },
       "dependsOn": ["^install"]
     },
diff --git a/apps/openchallenges/user-service/project.json b/apps/openchallenges/user-service/project.json
index b908482fb0..d0e25888b5 100644
--- a/apps/openchallenges/user-service/project.json
+++ b/apps/openchallenges/user-service/project.json
@@ -65,13 +65,13 @@
       },
       "dependsOn": []
     },
-    "build-image": {
-      "executor": "@nxrocks/nx-spring-boot:build-image",
-      "options": {
-        "root": "apps/openchallenges/user-service"
-      },
-      "dependsOn": ["^install"]
-    },
+    // "build-image": {
+    //   "executor": "@nxrocks/nx-spring-boot:build-image",
+    //   "options": {
+    //     "root": "apps/openchallenges/user-service"
+    //   },
+    //   "dependsOn": ["^install"]
+    // },
     "generate": {
       "executor": "nx:run-commands",
       "options": {