diff --git a/.github/workflows/deploy-aks.yml b/.github/workflows/deploy-aks.yml
index 046e058e..f77c4de0 100644
--- a/.github/workflows/deploy-aks.yml
+++ b/.github/workflows/deploy-aks.yml
@@ -55,6 +55,7 @@ jobs:
     name: Deploy Orchestrator
     if: ${{ inputs.deploy_orchestrator }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     permissions:
       id-token: write
       contents: read
@@ -84,6 +85,9 @@ jobs:
           resource-group: ${{ inputs.environment == 'stg' && vars.STG_AKS_RESOURCE_GROUP || vars.PRD_AKS_RESOURCE_GROUP }}
           cluster-name: ${{ inputs.environment == 'stg' && vars.STG_AKS_CLUSTER_NAME || vars.PRD_AKS_CLUSTER_NAME }}
 
+      - name: Convert kubeconfig for non-interactive login
+        run: kubelogin convert-kubeconfig -l azurecli
+
       - name: Setup Helm
         uses: azure/setup-helm@v4
 
@@ -125,6 +129,7 @@ jobs:
     name: Deploy Catalog
     if: ${{ inputs.deploy_catalog }}
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     permissions:
       id-token: write
       contents: read
@@ -154,6 +159,9 @@ jobs:
           resource-group: ${{ inputs.environment == 'stg' && vars.STG_AKS_RESOURCE_GROUP || vars.PRD_AKS_RESOURCE_GROUP }}
           cluster-name: ${{ inputs.environment == 'stg' && vars.STG_AKS_CLUSTER_NAME || vars.PRD_AKS_CLUSTER_NAME }}
 
+      - name: Convert kubeconfig for non-interactive login
+        run: kubelogin convert-kubeconfig -l azurecli
+
       - name: Setup Helm
         uses: azure/setup-helm@v4