diff --git a/.github/workflows/deploy-billboard.yml b/.github/workflows/deploy-billboard.yml
index 35bfbd3ac..73fd3719a 100644
--- a/.github/workflows/deploy-billboard.yml
+++ b/.github/workflows/deploy-billboard.yml
@@ -5,6 +5,7 @@ jobs:
     messenger-demo-deploy:
         runs-on: ubuntu-latest
         # if: ${{ contains( github.ref, vars.STAGING_BRANCH) }}
+        environment: staging-billboard
         steps:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v3
@@ -21,20 +22,20 @@ jobs:
             - name: Prepare SSH
               run: |
                   mkdir ~/.ssh
-                  echo "${{ secrets.STAGING_HOST_SSH_BILLBOARD }}" > ~/.ssh/known_hosts
+                  echo "${{ secrets.STAGING_HOST_SSH }}" > ~/.ssh/known_hosts
                   echo "${{ secrets.DO_SSH_KEY }}" > ./ssh-key
                   chmod 600 ./ssh-key
             - name: Create .env file
               env:
-                  TARGET_HOST: ${{ secrets.STAGING_HOST_BILLBOARD }}
+                  TARGET_HOST: ${{ secrets.STAGING_HOST }}
               run: |
                   echo "REACT_APP_ADDR_ENS_SUBDOMAIN=.bb-addr.dm3.eth" >> ./.env.react
-                  echo "REACT_APP_BACKEND=http://${{ secrets.STAGING_HOST_BILLBOARD }}/api" >> ./.env.react
+                  echo "REACT_APP_BACKEND=http://${{ secrets.STAGING_HOST }}/api" >> ./.env.react
                   echo "REACT_APP_DEFAULT_DELIVERY_SERVICE=beta-ds.dm3.eth" >> ./.env.react
-                  echo "REACT_APP_DEFAULT_SERVICE=http://${{ secrets.STAGING_HOST_BILLBOARD }}/api" >> ./.env.react
+                  echo "REACT_APP_DEFAULT_SERVICE=http://${{ secrets.STAGING_HOST }}/api" >> ./.env.react
                   echo "REACT_APP_ETHEREUM_PROVIDER=${{ secrets.REACT_APP_ETHEREUM_PROVIDER }}" >> ./.env.react
-                  echo "REACT_APP_PROFILE_BASE_URL=http://${{ secrets.STAGING_HOST_BILLBOARD }}/api" >> ./.env.react
-                  echo "REACT_APP_RESOLVER_BACKEND=http://${{ secrets.STAGING_HOST_BILLBOARD }}/resolver-handler" >> ./.env.react
+                  echo "REACT_APP_PROFILE_BASE_URL=http://${{ secrets.STAGING_HOST }}/api" >> ./.env.react
+                  echo "REACT_APP_RESOLVER_BACKEND=http://${{ secrets.STAGING_HOST }}/resolver-handler" >> ./.env.react
                   echo "REACT_APP_USER_ENS_SUBDOMAIN=.beta-user.dm3.eth" >> ./.env.react
                   echo "REACT_APP_WALLET_CONNECT_PROJECT_ID=${{ secrets.REACT_APP_WALLET_CONNECT_PROJECT_ID }}" >> ./.env.react
                   echo "REACT_APP_COMMIT_HASH=${{ env.sha_short }}" >> ./.env.react
@@ -63,26 +64,26 @@ jobs:
                   docker save -o ./dm3-backend.tar dm3-backend:latest
             - name: Sync files
               run: |
-                  rsync -avz -e 'ssh -i ./ssh-key' ./.env app@${{ secrets.STAGING_HOST_BILLBOARD }}:/home/app/dm3
-                  rsync -avz -e 'ssh -i ./ssh-key' ./dm3-backend.tar app@${{ secrets.STAGING_HOST_BILLBOARD }}:/home/app/dm3 
-                  rsync -avz -e 'ssh -i ./ssh-key' ./nginx.conf app@${{ secrets.STAGING_HOST_BILLBOARD }}:/home/app/dm3
-                  rsync -avz -e 'ssh -i ./ssh-key' ./docker/billboard/docker-compose.yml app@${{ secrets.STAGING_HOST_BILLBOARD }}:/home/app/dm3
+                  rsync -avz -e 'ssh -i ./ssh-key' ./.env app@${{ secrets.STAGING_HOST }}:/home/app/dm3
+                  rsync -avz -e 'ssh -i ./ssh-key' ./dm3-backend.tar app@${{ secrets.STAGING_HOST }}:/home/app/dm3 
+                  rsync -avz -e 'ssh -i ./ssh-key' ./nginx.conf app@${{ secrets.STAGING_HOST }}:/home/app/dm3
+                  rsync -avz -e 'ssh -i ./ssh-key' ./docker/billboard/docker-compose.yml app@${{ secrets.STAGING_HOST }}:/home/app/dm3
             - name: Prepare docker
               run: |
-                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST_BILLBOARD }} "\
+                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST }} "\
                   cd dm3 && docker compose down && docker system prune -af"
-                  ssh -i ./ssh-key root@${{ secrets.STAGING_HOST_BILLBOARD }} "\
+                  ssh -i ./ssh-key root@${{ secrets.STAGING_HOST }} "\
                   systemctl restart docker.service"
             - name: Load docker image
               run: |
-                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST_BILLBOARD }} "\
+                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST }} "\
                   cd dm3 && docker load -i dm3-backend.tar; \
                   rm dm3-backend.tar || true"
             - name: Firewall config
               run: |
-                  ssh -i ./ssh-key root@${{ secrets.STAGING_HOST_BILLBOARD }} "\
-                  ufw allow from 172.18.0.1/16 proto tcp to ${{ secrets.STAGING_HOST_BILLBOARD }} port 80"
+                  ssh -i ./ssh-key root@${{ secrets.STAGING_HOST }} "\
+                  ufw allow from 172.18.0.1/16 proto tcp to ${{ secrets.STAGING_HOST }} port 80"
             - name: Start
               run: |
-                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST_BILLBOARD }} "\
+                  ssh -i ./ssh-key app@${{ secrets.STAGING_HOST }} "\
                   cd dm3 && docker compose --env-file .env up -d"