diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 3e63cc5..0a11046 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -37,7 +37,7 @@ 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: Preparing signing material
@@ -46,9 +46,9 @@ jobs:
           playstore_json: ${{ secrets.PLAYSTORE_JSON }}
         run: |
           echo "$keystore" | base64 -d > kiwix-android/kiwix-android.keystore
-          if [ -n "${{ secrets[env.non_kiwix_organization_tag] }}" ]; then
+          if [ -n "${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}" ]; then
             echo "It is non-kiwix organization json file"
-            echo "${{ secrets[env.non_kiwix_organization_tag] }}" > kiwix-android/playstore.json
+            echo "${{ secrets[env.NON_KIWIX_ORGANIZATION_TAG] }}" > kiwix-android/playstore.json
           else
             echo "It is kiwix organization json file"
             echo "$playstore_json" > kiwix-android/playstore.json