diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index fd79ccf..dc0388f 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -23,20 +23,23 @@ jobs:
       - name: Checkout code
         run: |
           git clone $REPO_URL .
-          git checkout ${{ github.sha }}
+          git checkout ${{ gitea.sha }}
+
+      - name: Login to Docker Registry
+        run: |
+          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
 
       - name: Build & Push Docker image
         run: |
           apk add --no-cache docker-cli
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY -u admin --password-stdin
-          TAG=${{ github.sha }}
+          TAG=${{ gitea.sha }}
           docker build -t $REGISTRY/$APP:$TAG -t $REGISTRY/$APP:${{ inputs.environment }} .
           docker push $REGISTRY/$APP:$TAG
           docker push $REGISTRY/$APP:${{ inputs.environment }}
 
       - name: Setup kubectl
         run: |
-          curl -sLO "https://dl.k8s.io/release/v1.36.0/bin/linux/amd64/kubectl"
+          curl -sLO "https://dl.k8s.io/release/v1.30.0/bin/linux/amd64/kubectl"
           chmod +x kubectl
           mv kubectl /usr/local/bin/
           mkdir -p ~/.kube
@@ -44,6 +47,12 @@ jobs:
 
       - name: Deploy to K8s
         run: |
-          TAG=${{ github.sha }}
-          kubectl set image deployment/$APP $APP=$REGISTRY/$APP:$TAG -n lpt-${{ inputs.environment }}
+          TAG=${{ gitea.sha }}
+          kubectl set image deployment/$APP $APP=$REGISTRY/$APP:$TAG -n lpt-${{ inputs.environment }} --record
+          kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }} --timeout=5m
+
+      - name: Rollback on failure
+        if: failure()
+        run: |
+          kubectl rollout undo deployment/$APP -n lpt-${{ inputs.environment }}
           kubectl rollout status deployment/$APP -n lpt-${{ inputs.environment }}