diff --git a/.github/workflows/command_10_tests.yml b/.github/workflows/command_10_tests.yml
index d15d7333..3451b1c9 100644
--- a/.github/workflows/command_10_tests.yml
+++ b/.github/workflows/command_10_tests.yml
@@ -31,14 +31,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1045-clean"
       KEYFACTOR_HOSTNAME: "int1045-test-clean.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -49,14 +47,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1021-clean"
       KEYFACTOR_HOSTNAME: "int1021-test-clean.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -71,14 +67,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1045"
       KEYFACTOR_HOSTNAME: "integrations1045-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
       - name: Run tests
         run: go test -v ./cmd -run "^Test_Stores_*"
   Test_Stores_KFC_10_2_1:
@@ -89,14 +83,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1021"
       KEYFACTOR_HOSTNAME: "integrations1021-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -111,14 +103,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1045"
       KEYFACTOR_HOSTNAME: "integrations1045-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -131,15 +121,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1021"
       KEYFACTOR_HOSTNAME: "integrations1021-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: list dir
-        run: ls -la
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
-
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
diff --git a/.github/workflows/command_11_tests.yml b/.github/workflows/command_11_tests.yml
index 3f716c7d..19e6e12c 100644
--- a/.github/workflows/command_11_tests.yml
+++ b/.github/workflows/command_11_tests.yml
@@ -9,19 +9,15 @@ on:
 jobs:
   build:
     runs-on: self-hosted
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-
       - name: Install dependencies
         run: go mod download && go mod tidy
-
       - name: Install Azure CLI
         run: |
           curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
@@ -34,14 +30,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1100-clean"
       KEYFACTOR_HOSTNAME: "int11-test-clean.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
-
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -56,17 +50,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1100"
       KEYFACTOR_HOSTNAME: "integrations1100b3-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
-      - name: list dir
-        run: ls -la
-
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
-
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG
@@ -81,17 +70,12 @@ jobs:
     env:
       SECRET_NAME: "command-config-1100"
       KEYFACTOR_HOSTNAME: "integrations1100b3-lab.kfdelivery.com"
+      KEYFACTOR_DOMAIN: "command"
+      KEYFACTOR_USERNAME: ${{ secrets.LAB_USERNAME }}
+      KEYFACTOR_PASSWORD: ${{ secrets.LAB_PASSWORD }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-
-      - name: list dir
-        run: ls -la
-
-      - name: Get secret from Azure Key Vault
-        run: |
-          . ./examples/auth/akv/akv_auth.sh
-
       - name: Run tests
         run: |
           unset KFUTIL_DEBUG