diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 28359559..05095872 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -26,9 +26,9 @@ jobs:
       - name: Log in with Azure
         uses: azure/login@v1
         with:
-          client-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
-          tenant-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
-          subscription-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
+          client-id: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.SECURE_AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}
 
       - name: Set Azurite Default Key
         run: |
@@ -72,9 +72,9 @@ jobs:
       - name: Log in with Azure
         uses: azure/login@v1
         with:
-          client-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
-          tenant-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
-          subscription-id: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
+          client-id: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.SECURE_AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}
 
       - name: Get image tag
         id: get_image_tag
@@ -94,7 +94,7 @@ jobs:
         env:
           IMAGE_TAG: ${{needs.build_and_publish.outputs.image_tag}}
           ENVIRONMENT: staging
-          ARM_CLIENT_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).clientId }}
-          ARM_SUBSCRIPTION_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).subscriptionId }}
-          ARM_TENANT_ID: ${{ fromJSON(secrets.SECURE_AZURE_CREDENTIALS).tenantId }}
+          ARM_CLIENT_ID: ${{ secrets.SECURE_AZURE_CLIENT_ID }}
+          ARM_SUBSCRIPTION_ID: ${{ secrets.SECURE_AZURE_SUBSCRIPTION_ID }}
+          ARM_TENANT_ID: ${{ secrets.SECURE_AZURE_TENANT_ID }}
           ARM_USE_OIDC: true
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e31975b8..880d1442 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -11,13 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set Azurite Default Key
-        run: echo "AZURITE_ACCOUNT_KEY=$(curl https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111)" >> $GITHUB_ENV
-
-      - name: Verify Azurite Key was retrieved correctly
-        if: "!startsWith(env.AZURITE_ACCOUNT_KEY, 'Eby8')"
-        run: echo Failed to find key at learn.microsoft.com && exit 1
-
       - name: Run cibuild
         run: ./scripts/cibuild
 
@@ -30,8 +23,5 @@ jobs:
           python-version: "3.10" # stac-api-validator requires >= 3.10
           cache: "pip"
 
-      - name: Set Azurite Default Key
-        run: echo "AZURITE_ACCOUNT_KEY=$(curl https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111)" >> $GITHUB_ENV
-
       - name: API Validator
         run: ./scripts/validate
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index dcd860be..64d14257 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -20,7 +20,7 @@ services:
       - TILER_HREF=http://localhost:8080/data/
 
       # Azure Storage
-      - AZURITE_ACCOUNT_KEY=${AZURITE_ACCOUNT_KEY}
+      - AZURITE_ACCOUNT_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBHeksoGMGw==
       - PCAPIS_COLLECTION_CONFIG__ACCOUNT_URL=http://azurite:10002/devstoreaccount1
       - PCAPIS_COLLECTION_CONFIG__ACCOUNT_NAME=devstoreaccount1
       - PCAPIS_COLLECTION_CONFIG__ACCOUNT_KEY=${AZURITE_ACCOUNT_KEY}