diff --git a/.github/workflows/magento-package.yml b/.github/workflows/magento-package.yml
index bd91c24..46a0703 100644
--- a/.github/workflows/magento-package.yml
+++ b/.github/workflows/magento-package.yml
@@ -15,6 +15,8 @@ on:
         required: true
       GH_TOKEN:
         required: true
+      COMPOSER_AUTH:
+        required: false
 
 jobs:
   build_magento_package:
@@ -23,15 +25,9 @@ jobs:
     steps:
       - name: Setup SSH Key
         run: mkdir -p ~/.ssh && chmod 0700 ~/.ssh && echo "${{ secrets.SSH }}" > ~/.ssh/id_ed25519 && chmod 600 ~/.ssh/id_ed25519
-        
+      - name: Setup Composer GitHub token
+        run: mkdir -p $HOME/.composer && echo '${{ secrets.COMPOSER_AUTH }}' > $HOME/.composer/auth.json
       - name: Composer config
-        env:
-          COMPOSER_AUTH: |
-            {
-              "github-oauth": {
-                "github.com": "${{ secrets.GH_TOKEN }}"
-              }
-            }
         run: |
           composer config --global http-basic.repo.magento.com ${{ secrets.REPO_MAGENTO_COM_USER }} ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}
           composer config --global repositories.magento composer https://repo.magento.com
diff --git a/workflow-templates/magento-package.yml b/workflow-templates/magento-package.yml
index 655f998..856bb60 100644
--- a/workflow-templates/magento-package.yml
+++ b/workflow-templates/magento-package.yml
@@ -16,6 +16,7 @@ jobs:
       REPO_MAGENTO_COM_PASSWORD: ${{ secrets.REPO_MAGENTO_COM_PASSWORD }}
       SSH: ${{ secrets.SSH }}
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 
   phpcs:
     uses: AssetMarketingServicesInc/.github/.github/workflows/phpcs.yml@master