diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 727a9df4..bc9ba755 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -1,6 +1,6 @@
 name: Optimize map and deploy
 
-on: [ push ]
+on: [push]
 
 permissions:
   contents: write
@@ -17,8 +17,8 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "18.x"
+          registry-url: "https://registry.npmjs.org"
 
       - name: "Install dependencies"
         run: npm install
@@ -26,15 +26,31 @@ jobs:
       - name: "Build scripts"
         run: npm run build
 
-      - name: Deploy
+      - name: Use API key from secrets
+        env:
+          API_KEY: ${{ secrets.API_KEY }}
+        run: echo "API_KEY=${API_KEY}" >> $GITHUB_ENV
+
+      - name: Use URL Map STORAGE from secrets
+        env:
+          URL_MAP_STORAGE: ${{ secrets.URL_MAP_STORAGE }}
+        run: echo "URL_MAP_STORAGE=${URL_MAP_STORAGE}" >> $GITHUB_ENV
+
+      - name: Generate .env.secret
+        run: echo "API_KEY=${{ secrets.API_KEY }}" > .env.secret
+
+      - name: Extract UPLOAD_MODE from .env
+        run: echo "UPLOAD_MODE=$(grep UPLOAD_MODE .env | cut -d '=' -f2)" >> $GITHUB_ENV
+
+      - name: Deploy in MAP STORAGE
+        if: ${{ env.UPLOAD_MODE == 'MAP_STORAGE' }}
+        run: npx @workadventure/upload-maps upload.js
+
+      - name: Deploy on GITHUB PAGES
+        if: ${{ env.UPLOAD_MODE == 'GH_PAGES' }}
         uses: JamesIves/github-pages-deploy-action@releases/v3
-        if: github.ref == 'refs/heads/master'
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: dist/ # The folder the action should deploy.
+          BRANCH: gh-pages
+          FOLDER: dist/
           BASE_BRANCH: master
-
-      - name: Bash2
-        run: |
-          ls -al