diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index be3bfb0..711e53b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -26,19 +26,26 @@ jobs:
       - name: Copying custom app configuration into Kiwix Android code base
         run: ./copy_files_to_kiwix_android.sh
 
-      - name: Preparing signing material
-        env:
-          keystore: ${{ secrets.keystore }}
-          playstore_json: ${{ secrets.PLAYSTORE_JSON }}
-        run: |
-          echo "$playstore_json" > kiwix-android/playstore.json
-          echo "$keystore" | base64 -d > kiwix-android/kiwix-android.keystore
       - name: Set tag variable
         run: echo "TAG=$(echo ${GITHUB_REF:10})" >> $GITHUB_ENV
 
       - name: Install jq
         run: sudo apt-get install -y jq
 
+      - name: Preparing signing material
+        env:
+          keystore: ${{ secrets.keystore }}
+          playstore_json: ${{ secrets.PLAYSTORE_JSON }}
+        run: |
+          echo "$keystore" | base64 -d > kiwix-android/kiwix-android.keystore
+          non_kiwix_organization_tag='PLAYSTORE_JSON_'${TAG}
+          non_kiwix_playstore_json=${{ secrets[non_kiwix_organization_tag] || '' }}
+          if [ -n "$non_kiwix_playstore_json" ]; then
+            echo "$non_kiwix_playstore_json" > kiwix-android/playstore.json
+          else
+            echo "$playstore_json" > kiwix-android/playstore.json
+          fi
+
       - name: Should upload Bundle
         run: |
           cd ${TAG}