diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index 542b5bd..8a99622 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -13,16 +13,16 @@ jobs:
   build-and-push:
     runs-on: k3s-home
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
       - name: Create Kaniko Job
         run: |
+          JOB_NAME="kaniko-jovies-$(echo $GITHUB_SHA | cut -c1-7)"
+          echo "Creating Kaniko Job: $JOB_NAME"
+
           cat <<EOF | kubectl apply -f -
           apiVersion: batch/v1
           kind: Job
           metadata:
-            name: kaniko-jovies-${GITHUB_SHA:0:7}
+            name: $JOB_NAME
             namespace: gitea
           spec:
             ttlSecondsAfterFinished: 300
@@ -36,8 +36,8 @@ jobs:
                   - "--context=git://github0213.com/Mayne0213/jovies.git#refs/heads/main"
                   - "--dockerfile=Dockerfile"
                   - "--context-sub-path=nextjs"
-                  - "--destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
-                  - "--destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA}"
+                  - "--destination=${REGISTRY}/${IMAGE_NAME}:latest"
+                  - "--destination=${REGISTRY}/${IMAGE_NAME}:${GITHUB_SHA}"
                   volumeMounts:
                   - name: docker-config
                     mountPath: /kaniko/.docker
@@ -53,10 +53,19 @@ jobs:
 
       - name: Wait for Kaniko Job
         run: |
-          kubectl wait --for=condition=complete job/kaniko-jovies-${GITHUB_SHA:0:7} -n gitea --timeout=600s || \
-          (kubectl logs job/kaniko-jovies-${GITHUB_SHA:0:7} -n gitea && exit 1)
+          JOB_NAME="kaniko-jovies-$(echo $GITHUB_SHA | cut -c1-7)"
+          echo "Waiting for Job: $JOB_NAME"
+
+          if ! kubectl wait --for=condition=complete job/$JOB_NAME -n gitea --timeout=600s; then
+            echo "Job failed. Logs:"
+            kubectl logs job/$JOB_NAME -n gitea
+            exit 1
+          fi
+
+          echo "Build completed successfully!"
 
       - name: Cleanup
         if: always()
         run: |
-          kubectl delete job kaniko-jovies-${GITHUB_SHA:0:7} -n gitea --ignore-not-found
+          JOB_NAME="kaniko-jovies-$(echo $GITHUB_SHA | cut -c1-7)"
+          kubectl delete job $JOB_NAME -n gitea --ignore-not-found
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
deleted file mode 100644
index 30aa206..0000000
--- a/.gitea/workflows/test.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Test Runner
-
-on:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: k3s-home
-    steps:
-      - name: Test kubectl
-        run: |
-          echo "Testing kubectl..."
-          kubectl version --client
-          kubectl get pods -n gitea
-          echo "GITHUB_SHA: $GITHUB_SHA"
-          echo "Done!"