diff --git a/.gitea/workflows/build-all-images.yaml b/.gitea/workflows/build-all-images.yaml
index 93d376e..f8e9850 100644
--- a/.gitea/workflows/build-all-images.yaml
+++ b/.gitea/workflows/build-all-images.yaml
@@ -29,6 +29,7 @@ jobs:
         version: ${{ fromJson(needs.get-versions.outputs.versions) }}
     steps:
       - uses: actions/checkout@v4
+
       - name: Login to Docker Registry
         uses: docker/login-action@v3
         with:
@@ -36,13 +37,18 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build Docker Image
+      - name: Docker Build
         run: ./scripts/build-image.sh
+        id: build-image
         env:
           UNITY_VERSION: ${{ matrix.version }}
           UNITY_PLATFORM: ${{ matrix.platform }}
           IMAGE_NAME: ${{ env.DOCKER_REGISTRY }}unityci/editor
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
-          
-      - name: Push Docker Image
-        run: echo "TODO"
\ No newline at end of file
+
+      - name: Docker Push
+        run: |
+            echo "Pushing Docker Image  ${{ steps.build-image.outputs.FULL_IMAGE }}"
+            echo "- Image: ${{ steps.build-image.outputs.IMAGE }}"
+            echo "- Tag: ${{ steps.build-image.outputs.TAG }}"
+            docker push ${{ steps.build-image.outputs.FULL_IMAGE }}
\ No newline at end of file
diff --git a/.gitea/workflows/build-latest-image.yaml b/.gitea/workflows/build-latest-image.yaml
index f75a44d..a504360 100644
--- a/.gitea/workflows/build-latest-image.yaml
+++ b/.gitea/workflows/build-latest-image.yaml
@@ -40,7 +40,7 @@ jobs:
           VERSION=$(head -n 1 versions.txt)
           echo "UNITY_VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Build Docker Image
+      - name: Docker Build
         run: ./scripts/build-image.sh
         id: build-image
         env:
@@ -49,9 +49,9 @@ jobs:
           IMAGE_NAME: ${{ env.DOCKER_REGISTRY }}unityci/editor
           GAMECI_VERSION: ${{ env.GAMECI_VERSION }}
 
-      - name: Push Docker Image
+      - name: Docker Push
         run: |
-            echo "Pushing Docker Image..."
-            echo "Image Name: ${{ steps.build-image.outputs.IMAGE_NAME }}"
-            echo "Tag: ${{ steps.build-image.outputs.TAG }}"
-            echo "Image: ${{ steps.build-image.outputs.IMAGE }}"
\ No newline at end of file
+            echo "Pushing Docker Image  ${{ steps.build-image.outputs.FULL_IMAGE }}"
+            echo "- Image: ${{ steps.build-image.outputs.IMAGE }}"
+            echo "- Tag: ${{ steps.build-image.outputs.TAG }}"
+            docker push ${{ steps.build-image.outputs.FULL_IMAGE }}
\ No newline at end of file
diff --git a/scripts/build-image.sh b/scripts/build-image.sh
index 50c3997..5085af5 100755
--- a/scripts/build-image.sh
+++ b/scripts/build-image.sh
@@ -19,12 +19,12 @@ if [ -z "${UNITY_PLATFORM}" ]; then
     fi
 fi
 
-# Ensure IMAGE_NAME is set, pull from arguments if not
-if [ -z "${IMAGE_NAME}" ]; then
+# Ensure IMAGE is set, pull from arguments if not
+if [ -z "${IMAGE}" ]; then
     if [ -n "$3" ]; then
-        IMAGE_NAME=$3
+        IMAGE=$3
     else
-        echo "Error: IMAGE_NAME is not set."
+        echo "Error: IMAGE is not set."
         exit 1
     fi
 fi
@@ -49,16 +49,18 @@ fi
 
 BASE_IMAGE=unityci/editor:ubuntu-${UNITY_VERSION}-${UNITY_PLATFORM}-${GAMECI_VERSION}
 TAG=ubuntu-${UNITY_VERSION}-${UNITY_PLATFORM}-runner
+FULL_IMAGE=${IMAGE}:${TAG}
 
-echo "Base Image: ${BASE_IMAGE}"
-echo "Tag: ${TAG}"
-echo "Image: ${IMAGE_NAME}:${TAG}"
-echo "Platfrom: ${PLATFORM}"
+echo "Building Docker image ${FULL_IMAGE}"
+echo "- Platfrom: ${PLATFORM}"
+echo "- Base: ${BASE_IMAGE}"
+echo "- Tag: ${TAG}"
+echo "- Image: ${IMAGE}:${TAG}"
 
 docker build \
     --platform ${PLATFORM} \
     --build-arg BASE_IMAGE=${BASE_IMAGE} \
-    -t ${IMAGE_NAME}:${TAG} \
+    -t FULL_IMAGE \
     ${DOCKER_BUILD_ARGS} \
     .
 
@@ -67,9 +69,9 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-# Export IMAGE_NAME and TAG for GitHub Actions
+# Export IMAGE and TAG for GitHub Actions
 if [ -n "$GITHUB_OUTPUT" ]; then
-    echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_OUTPUT
+    echo "IMAGE=${IMAGE}" >> $GITHUB_OUTPUT
     echo "TAG=${TAG}" >> $GITHUB_OUTPUT
-    echo "IMAGE=${IMAGE_NAME}:${TAG}" >> $GITHUB_OUTPUT
+    echo "FULL_IMAGE=${FULL_IMAGE}" >> $GITHUB_OUTPUT
 fi