diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 398654c..6af3d4c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -42,11 +42,8 @@ jobs:
 
       - name: Determine playstore.json file
         run: |
-          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
-          fi
+          non_kiwix_secret="${NON_KIWIX_ORGANIZATION_TAG}"
+          echo "CUSTOM_PLAYSTORE_JSON=${{ secrets[non_kiwix_secret] || secrets.PLAYSTORE_JSON }}" >> $GITHUB_ENV
 
       - name: Preparing signing material
         env: