diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 4e097735..de598752 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -1,16 +1,6 @@
 name: Deploy Admin Panel
 
 on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'src/**'
-      - 'server.ts'
-      - 'package.json'
-      - 'bun.lock'
-      - 'Dockerfile'
-      - '.github/workflows/deploy.yaml'
   workflow_dispatch:
     inputs:
       application:
@@ -24,9 +14,11 @@ on:
           - jarvis-demo
       region:
         description: 'AWS Region to deploy to'
-        type: string
+        type: choice
         required: true
         default: us-east-1
+        options:
+          - us-east-1
 
 permissions:
   id-token: write
@@ -62,8 +54,6 @@ jobs:
     name: Build & Push to ECR
     runs-on: ubuntu-latest
     needs: test
-    outputs:
-      image: ${{ steps.tags.outputs.ecr_image }}
     steps:
       - uses: actions/checkout@v6
 
@@ -75,7 +65,7 @@ jobs:
         with:
           role-to-assume: ${{ secrets.SAAS_AWS_DEPLOY_ROLE_ARN }}
           role-session-name: deployment-role-session
-          aws-region: ${{ inputs.region || 'us-east-1' }}
+          aws-region: ${{ inputs.region }}
 
       - name: Login to Amazon ECR
         id: login-ecr
@@ -83,13 +73,6 @@ jobs:
         with:
           registries: "897729109735"
 
-      - name: Determine image tags
-        id: tags
-        run: |
-          ECR_IMAGE="${{ steps.login-ecr.outputs.registry }}/jarvis/admin-panel"
-          echo "ecr_image=${ECR_IMAGE}:${{ github.sha }}" >> $GITHUB_OUTPUT
-          echo "tags=${ECR_IMAGE}:${{ github.sha }},${ECR_IMAGE}:latest" >> $GITHUB_OUTPUT
-
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
@@ -97,14 +80,15 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64
           push: true
-          tags: ${{ steps.tags.outputs.tags }}
+          tags: |
+            ${{ steps.login-ecr.outputs.registry }}/jarvis/admin-panel:${{ github.sha }}
+            ${{ steps.login-ecr.outputs.registry }}/jarvis/admin-panel:latest
           provenance: false
 
   deploy:
     name: Deploy to EKS
     runs-on: ubuntu-latest
     needs: build-and-push
-    if: github.event_name == 'workflow_dispatch'
     env:
       DEPLOYMENT_NAME: jarvis-admin-panel
     steps:
@@ -143,9 +127,11 @@ jobs:
         run: aws eks update-kubeconfig --name ${{ steps.config.outputs.eks_cluster_name }} --region ${{ inputs.region }}
 
       - name: Update image on EKS
+        env:
+          admin_panel_image: ${{ steps.login-ecr.outputs.registry }}/jarvis/admin-panel:${{ github.sha }}
         run: |
           kubectl set image deploy/${{ env.DEPLOYMENT_NAME }} \
-            jarvis-admin-panel=${{ needs.build-and-push.outputs.image }} \
+            jarvis-admin-panel=$admin_panel_image \
             -n ${{ inputs.application }}
 
       - name: Restart pods
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index b75f7cde..31b69021 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -31,7 +31,7 @@ const navItems: t.NavItem[] = [
     capability: [SystemCapabilities.READ_ROLES, SystemCapabilities.READ_GROUPS],
   },
   { labelKey: 'com_nav_grants', path: '/grants', icon: 'lock' },
-  { labelKey: 'com_nav_help', path: '/help', icon: 'question' },
+  // { labelKey: 'com_nav_help', path: '/help', icon: 'question' },
 ];
 
 function getUserInitials(user?: { name?: string; email?: string } | null): string {