diff --git a/.gitea/workflows/build-and-deploy.yaml b/.gitea/workflows/build-and-deploy.yaml
index d90e4aa..aedcc1d 100644
--- a/.gitea/workflows/build-and-deploy.yaml
+++ b/.gitea/workflows/build-and-deploy.yaml
@@ -87,36 +87,36 @@ jobs:
 
       - name: Verify kubectl connection
         run: |
-          kubectl get deployment socktop-webterm -n default || echo "Deployment will be created"
+          kubectl get deployment socktop-webterm -n socktop || echo "Deployment will be created"
 
       - name: Check and create/update deployment
         run: |
           VERSION="${{ needs.build-and-push.outputs.version }}"
 
           # Check if deployment exists
-          if kubectl get deployment socktop-webterm -n default &> /dev/null; then
+          if kubectl get deployment socktop-webterm -n socktop &> /dev/null; then
             echo "Deployment exists, updating image..."
             kubectl set image deployment/socktop-webterm \
               webterm=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} \
-              -n default
+              -n socktop
           else
             echo "Deployment does not exist, creating it..."
-            kubectl apply -f kubernetes/03-deployment.yaml
+            kubectl apply -f kubernetes/03-deployment.yaml -n socktop
 
             # Update the image to the correct version
             kubectl set image deployment/socktop-webterm \
               webterm=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION} \
-              -n default
+              -n socktop
           fi
 
       - name: Wait for rollout to complete
         run: |
-          kubectl rollout status deployment/socktop-webterm -n default --timeout=5m
+          kubectl rollout status deployment/socktop-webterm -n socktop --timeout=5m
 
       - name: Verify deployment
         run: |
-          kubectl get deployment socktop-webterm -n default
-          kubectl get pods -l app=socktop-webterm -n default
+          kubectl get deployment socktop-webterm -n socktop
+          kubectl get pods -l app=socktop-webterm -n socktop
 
       - name: Deployment summary
         if: always()
@@ -127,5 +127,5 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "### Pods Status" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
-          kubectl get pods -l app=socktop-webterm -n default >> $GITHUB_STEP_SUMMARY
+          kubectl get pods -l app=socktop-webterm -n socktop >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY