diff --git a/.github/actions/setup-rancher-cli/action.yml b/.github/actions/setup-rancher-cli/action.yml
index 891a743f4..4cd13c4cc 100644
--- a/.github/actions/setup-rancher-cli/action.yml
+++ b/.github/actions/setup-rancher-cli/action.yml
@@ -17,6 +17,8 @@ inputs:
   context:
     description: 'Rancher context for kubectl configuration'
     required: false
+    default: local
+
 runs:
   using: "composite"
   steps:
@@ -36,10 +38,13 @@ runs:
         RANCHER2_URL=${{ inputs.url }}
         if [[ -n "$RANCHER2_BEARER_TOKEN" ]]
         then
-          RANCHER_SYSTEM_CONTEXT_INDEX=$(echo 1 | rancher login $RANCHER2_URL -t $RANCHER2_BEARER_TOKEN | grep local | grep System | cut -d ' ' -f1)
+          RANCHER_SYSTEM_CONTEXT_INDEX=$(echo 1 | rancher login $RANCHER2_URL -t $RANCHER2_BEARER_TOKEN | grep "$KUBECONTEXT" | grep System | cut -d ' ' -f1)
           echo $RANCHER_SYSTEM_CONTEXT_INDEX | rancher login $RANCHER2_URL -t $RANCHER2_BEARER_TOKEN > /dev/null
         fi
       shell: bash
+      env:
+        KUBECONTEXT: ${{ inputs.context }}
+
     - run: |
         KUBECONTEXT="${{ inputs.context }}"
         if [[ -n "$KUBECONTEXT" ]]
diff --git a/version.txt b/version.txt
index 15ee400bd..508879b8a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v3.3.1
+v3.3.2