diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index db2b615..160fdf6 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -85,7 +85,6 @@ jobs:
 
   deploy:
     runs-on: ubuntu-latest
-
     needs: integration
 
     steps:
@@ -99,6 +98,11 @@ jobs:
             exit 1
           fi
 
+      - name: Set environment variables for Docker Compose
+        run: |
+          echo "DOCKER_REPO=${{ secrets.DOCKER_REPO }}" >> $GITHUB_ENV
+          echo "GITHUB_RUN_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
+
       - name: Copy docker-compose into instance
         uses: appleboy/scp-action@master
         with:
@@ -120,10 +124,10 @@ jobs:
           key: ${{ secrets.PEM_KEY }}
           script: |
             cd /home/${{ secrets.USERNAME }}
-            envsubst < docker-compose.yml > docker-compose-dev.yml
+            envsubst < <(echo "${{ secrets.DOCKER_COMPOSE_DEV }}") > docker-compose-dev.yml
             echo ${{ secrets.DOCKER_PASSWORD }} | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
             if [ "$(sudo docker ps -q)" ]; then sudo docker stop $(sudo docker ps -q); fi
             if [ "$(sudo docker ps -a -q)" ]; then sudo docker rm $(sudo docker ps -a -q); fi
-            sudo docker pull ${{ secrets.DOCKER_REPO }}:${{ steps.meta.outputs.tags }}-${{ github.run_number }}
+            sudo docker pull ${{ secrets.DOCKER_REPO }}:develop-${{ github.run_number }}
             sudo docker-compose -f docker-compose-dev.yml up -d
             sudo docker image prune -f
\ No newline at end of file