diff --git a/.github/workflows/halo.yaml b/.github/workflows/halo.yaml
index be5e97e41..dadf0ac0a 100644
--- a/.github/workflows/halo.yaml
+++ b/.github/workflows/halo.yaml
@@ -81,7 +81,8 @@ jobs:
         run: gh release upload ${{ github.event.release.tag_name }} application/build/libs/*
 
   build-and-publish-container-image-with-buildpacks:
-    if: always() && (github.event_name == 'push' || github.event_name == 'release')
+    needs: build
+    if: always() && needs.build.result == 'success' && (github.event_name == 'push' || github.event_name == 'release')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/application/build.gradle b/application/build.gradle
index 46e16a643..185e5b1b0 100644
--- a/application/build.gradle
+++ b/application/build.gradle
@@ -242,11 +242,11 @@ tasks.register('publishToDockerHub', BootBuildImage) {
 }
 
 tasks.register('publishToFit2Cloud', BootBuildImage) {
-    imageName = "registry.fit2cloud.com/${name}:${tagName}"
+    imageName = "registry.fit2cloud.com/halo/${name}:${tagName}"
     description = 'Build and publish the Docker image to Fit2Cloud Container Registry.'
     publish = StringUtils.hasText(System.getenv('F2C_TOKEN'))
     if (!isRelease) {
-        tags = ["registry.fit2cloud.com/${name}:main".toString()]
+        tags = ["registry.fit2cloud.com/halo/${name}:main".toString()]
     }
     docker {
         publishRegistry {