diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 36d9ed8..c80a3d5 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -37,12 +37,17 @@ jobs:
 
       - name: Set non-kiwix organization tag
         run: |
-          non_kiwix_organization_tag="PLAYSTORE_JSON_${TAG}"
+          non_kiwix_organization_tag="PLAYSTORE_JSON_${TAG^^}"
           echo "NON_KIWIX_ORGANIZATION_TAG=${non_kiwix_organization_tag}" >> $GITHUB_ENV
 
       - name: Determine playstore.json file
         run: |
-          echo "CUSTOM_PLAYSTORE_JSON=${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] || secrets.PLAYSTORE_JSON }}" >> $GITHUB_ENV
+          SECRET_VALUE="${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}"
+          if [ -n "$SECRET_VALUE" ]; then
+            echo "CUSTOM_PLAYSTORE_JSON=${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}" >> $GITHUB_ENV
+          else
+            echo "CUSTOM_PLAYSTORE_JSON=${{ secrets.PLAYSTORE_JSON }}" >> $GITHUB_ENV
+          fi
 
       - name: Preparing signing material
         env: