diff --git a/action.yml b/action.yml
index 81d900c..0d79c9c 100644
--- a/action.yml
+++ b/action.yml
@@ -22,21 +22,41 @@ runs:
     - name: Configure Workflow
       shell: bash
       echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
-      
+      if [ ${{ inputs.deploy-env }} == "edge" ]; then
+        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+      elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+        echo OASIS_INFISICAL_TOKEN=${{ secrets.INFISICAL_ELYSIUM_PROD_READ_TOKEN }} >> $GITHUB_ENV
+        echo OASIS_INFISICAL_WORKFLOW=/workflows/oasis-edge-deploy >> $GITHUB_ENV
+      else
+        echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+        exit 1
+      fi
+  
     # Set additional Envars
     - name: Setup Oasis Envars
       uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
       with:
-        infisical-token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}
-        environment: ci
-        secret-path: /workflows/oasis-ci-deploy
+        infisical-token: ${{ env.OASIS_INFISICAL_TOKEN }}
+        environment: ${{ env.OASIS_ENV_STRATEGY}}
+        secret-path: ${{ env.OASIS_INFISICAL_WORKFLOW }}
 
-      run: echo "Getting envars"
-    - name: Setup Environment
-      shell: bash
-      run: |
-        echo CI_NAMESPACE=ci-$SHORT_COMMIT_SHA >> $GITHUB_ENV
-        echo DEVOPS_GITEA_ELYSIUM_ORG_READ_TOKEN=${{ inputs.gitea-token }} >> $GITHUB_ENV
-        echo "Checking out Oasis"        
+    - name: Configure Kubeconfig
+          shell: bash
+          echo OASIS_ENV_STRATEGY=${{ inputs.deploy-env }} >> $GITHUB_ENV
+          if [ ${{ inputs.deploy-env }} == "edge" ]; then
+            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV
+          elif [ ${{ inputs.deploy-env }} == "ci" ]; then
+            echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV
+          else
+            echo "Error! deploy-env required, and must be 'ci' or 'edge'!"
+            exit 1
+          fi
+    - name: Oasis Setup
+      uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-advanced
+      with:
+        oasis-branch: ep/Feb13-2024/ActionRework
+        kubeconfig: ${{ env.OASIS_WORKFLOW_KUBECONFIG }}
+