diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 711e53b..f0c9bb0 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -32,16 +32,19 @@ jobs:
       - name: Install jq
         run: sudo apt-get install -y jq
 
+      - name: Set non-kiwix organization tag
+        run: |
+          non_kiwix_organization_tag="PLAYSTORE_JSON_${TAG}"
+          echo "NON_KIWIX_ORGANIZATION_TAG=${non_kiwix_organization_tag}" >> $GITHUB_ENV
+
       - 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
+          if [ -n "${{ secrets[env.non_kiwix_organization_tag] }}" ]; then
+            echo "${{ secrets[env.non_kiwix_organization_tag] }}" > kiwix-android/playstore.json
           else
             echo "$playstore_json" > kiwix-android/playstore.json
           fi
@@ -135,7 +138,7 @@ jobs:
 
       - name: Upload Bundle as an artifact
         if: env.should_publish == 'true'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.bundle_name }}
           path: ${{ env.bundle_path }}