diff --git a/.gitea/workflows/dev-deploy.yml b/.gitea/workflows/dev-deploy.yml
index 875849b..b025d75 100644
--- a/.gitea/workflows/dev-deploy.yml
+++ b/.gitea/workflows/dev-deploy.yml
@@ -24,24 +24,30 @@ jobs:
 
     - name: Login to registry
       run: |
-        echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY \
+        echo "${{ secrets.REGISTRY_PASSWORD }}" | sudo docker login $REGISTRY \
           -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
 
     - name: Build and push image
       run: |
-        docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
-        docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        sudo docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
+        sudo docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Clone manifest repo
       run: |
         git clone https://oauth2:${{ secrets.MANIFEST_REPO_TOKEN }}@${{ secrets.MANIFEST_REPO_URL }} manifest
         cd manifest
-        git checkout dev
+        git checkout $ENV_NAME
+
+    - name: Install kustomize
+      run: |
+        curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
+        sudo mv kustomize /usr/local/bin/
 
     - name: Update kustomization (DEV)
       run: |
         cd manifest/overlays
-        kustomize edit set image $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        kustomize edit set image \
+          $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Commit manifest update
       run: |
@@ -49,7 +55,7 @@ jobs:
         git config user.name "csa-ci"
         git config user.email "ci@gitea.local"
         git commit -am "deploy(${ENV_NAME}): update backend image to $IMAGE_TAG"
-        git push origin (${ENV_NAME})
+        git push origin $ENV_NAME
 
     - name: Cleanup workspace
       run: |
diff --git a/.gitea/workflows/prod-deploy.yaml b/.gitea/workflows/live-deploy.yaml
similarity index 74%
rename from .gitea/workflows/prod-deploy.yaml
rename to .gitea/workflows/live-deploy.yaml
index 8734dfd..a42c5bb 100644
--- a/.gitea/workflows/prod-deploy.yaml
+++ b/.gitea/workflows/live-deploy.yaml
@@ -24,24 +24,25 @@ jobs:
 
     - name: Login to registry
       run: |
-        echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY \
+        echo "${{ secrets.REGISTRY_PASSWORD }}" | sudo docker login $REGISTRY \
           -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
 
     - name: Build and push image
       run: |
-        docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
-        docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        sudo docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
+        sudo docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Clone manifest repo
       run: |
         git clone https://oauth2:${{ secrets.MANIFEST_REPO_TOKEN }}@${{ secrets.MANIFEST_REPO_URL }} manifest
         cd manifest
-        git checkout (${ENV_NAME})
+        git checkout $ENV_NAME
 
     - name: Update kustomization (PROD)
       run: |
         cd manifest/overlays
-        kustomize edit set image $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        kustomize edit set image \
+          $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Commit manifest update
       run: |
@@ -49,7 +50,7 @@ jobs:
         git config user.name "csa-ci"
         git config user.email "ci@gitea.local"
         git commit -am "deploy(${ENV_NAME}): update backend image to $IMAGE_TAG"
-        git push origin (${ENV_NAME})
+        git push origin $ENV_NAME
 
     - name: Cleanup workspace
       run: |
diff --git a/.gitea/workflows/staging-deploy.yaml b/.gitea/workflows/staging-deploy.yaml
index 79705f8..938dd02 100644
--- a/.gitea/workflows/staging-deploy.yaml
+++ b/.gitea/workflows/staging-deploy.yaml
@@ -24,24 +24,30 @@ jobs:
 
     - name: Login to registry
       run: |
-        echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login $REGISTRY \
+        echo "${{ secrets.REGISTRY_PASSWORD }}" | sudo docker login $REGISTRY \
           -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
 
     - name: Build and push image
       run: |
-        docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
-        docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        sudo docker build -t $REGISTRY/$IMAGE_NAME:$IMAGE_TAG .
+        sudo docker push $REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Clone manifest repo
       run: |
         git clone https://oauth2:${{ secrets.MANIFEST_REPO_TOKEN }}@${{ secrets.MANIFEST_REPO_URL }} manifest
         cd manifest
-        git checkout (${ENV_NAME})
+        git checkout $ENV_NAME
 
-    - name: Update kustomization (PROD)
+    - name: Install kustomize
+      run: |
+        curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
+        sudo mv kustomize /usr/local/bin/
+
+    - name: Update kustomization (STAGING)
       run: |
         cd manifest/overlays
-        kustomize edit set image $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
+        kustomize edit set image \
+          $REGISTRY/$IMAGE_NAME=$REGISTRY/$IMAGE_NAME:$IMAGE_TAG
 
     - name: Commit manifest update
       run: |
@@ -49,7 +55,7 @@ jobs:
         git config user.name "csa-ci"
         git config user.email "ci@gitea.local"
         git commit -am "deploy(${ENV_NAME}): update backend image to $IMAGE_TAG"
-        git push origin (${ENV_NAME})
+        git push origin $ENV_NAME
 
     - name: Cleanup workspace
       run: |