diff --git a/justfile b/justfile
index 26d8126..df02790 100644
--- a/justfile
+++ b/justfile
@@ -128,12 +128,17 @@ docker-clean: docker-stop
 # Tag image for registry
 docker-tag:
     @echo "Tagging image for registry..."
-    docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}
-    docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}
+    echo "Tagging {{PROJECT}}:{{IMAGE_TAG}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}"
+    docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true
+    echo "Tagging {{PROJECT}}:{{IMAGE_TAG_COMMIT}} -> {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}"
+    docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true
 
-# Push image to registry
-docker-push: docker-build-full docker-tag
-    @echo "Pushing image to {{REGISTRY}}..."
+# Push image to registry (builds, tags, and pushes)
+docker-push: docker-build-full
+    @echo "Tagging images for registry..."
+    docker tag {{PROJECT}}:{{IMAGE_TAG}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG}} || true
+    docker tag {{PROJECT}}:{{IMAGE_TAG_COMMIT}} {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}} || true
+    @echo "Pushing images to {{REGISTRY}}..."
     docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG}}
     docker push {{REGISTRY_IMAGE}}:{{IMAGE_TAG_COMMIT}}