diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index c80a3d5..6a3379a 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -41,9 +41,10 @@ jobs:
           echo "NON_KIWIX_ORGANIZATION_TAG=${non_kiwix_organization_tag}" >> $GITHUB_ENV
 
       - name: Determine playstore.json file
+        env:
+          NON_KIWIX_ORGANIZATION_TAG: ${{ env.NON_KIWIX_ORGANIZATION_TAG }}
         run: |
-          SECRET_VALUE="${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}"
-          if [ -n "$SECRET_VALUE" ]; then
+          if [ -n "${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}" ]; then
             echo "CUSTOM_PLAYSTORE_JSON=${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}" >> $GITHUB_ENV
           else
             echo "CUSTOM_PLAYSTORE_JSON=${{ secrets.PLAYSTORE_JSON }}" >> $GITHUB_ENV