diff --git a/.github/workflows/sandbox_build_and_deploy.yml b/.github/workflows/sandbox_build_and_deploy.yml
index 57acbdde..ab79880b 100644
--- a/.github/workflows/sandbox_build_and_deploy.yml
+++ b/.github/workflows/sandbox_build_and_deploy.yml
@@ -51,7 +51,7 @@ jobs:
           push: true
           build-args: VERSION=${{ steps.vars.outputs.version }}
           tags: membraneframework/demo_webrtc_videoroom_advanced:${{ env.TAG }}
-      
+
   deploy:
     runs-on: ubuntu-latest
     needs: build
@@ -64,12 +64,10 @@ jobs:
 
       - name: Deploy docker compose to a pre-configured server
         id: deploy
-        uses: Autom3/docker-deployment-action@3.0.1
+        uses: TapTap21/docker-remote-deployment-action@v1.1
         with:
           remote_docker_host: ${{ secrets.SANDBOX_HOST }}
           ssh_private_key: ${{ secrets.SSH_PRIV_KEY }}
           ssh_public_key: ${{ secrets.SSH_KNOWN_HOSTS}}
-          deployment_mode: docker-compose
           stack_file_name: docker-compose.yml
-          pull_images_first: true
-          args: --env-file .env up -d
+          args: -p sandbox --env-file .env up -d --remove-orphans
diff --git a/.github/workflows/staging_build_and_deploy.yml b/.github/workflows/staging_build_and_deploy.yml
index eb3d1e5c..49ada8db 100644
--- a/.github/workflows/staging_build_and_deploy.yml
+++ b/.github/workflows/staging_build_and_deploy.yml
@@ -51,7 +51,7 @@ jobs:
           push: true
           build-args: VERSION=${{ steps.vars.outputs.version }}
           tags: membraneframework/demo_webrtc_videoroom_advanced:${{ env.TAG }}
-      
+
   deploy:
     runs-on: ubuntu-latest
     needs: build
@@ -64,12 +64,10 @@ jobs:
 
       - name: Deploy docker compose to a pre-configured server
         id: deploy
-        uses: Autom3/docker-deployment-action@3.0.1
+        uses: TapTap21/docker-remote-deployment-action@v1.1
         with:
           remote_docker_host: ${{ secrets.STAGING_HOST }}
           ssh_private_key: ${{ secrets.SSH_PRIV_KEY }}
           ssh_public_key: ${{ secrets.SSH_KNOWN_HOSTS}}
-          deployment_mode: docker-compose
           stack_file_name: docker-compose.yml
-          pull_images_first: true
-          args: --env-file .env up -d
+          args: -p staging --env-file .env up -d --remove-orphans
diff --git a/.github/workflows/tag_build_and_deploy.yml b/.github/workflows/tag_build_and_deploy.yml
index 85b09d27..13652d26 100644
--- a/.github/workflows/tag_build_and_deploy.yml
+++ b/.github/workflows/tag_build_and_deploy.yml
@@ -56,7 +56,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
-    steps:  
+    steps:
       - uses: actions/checkout@v3
 
       - name: Prepare .env file for the deployment
@@ -65,13 +65,11 @@ jobs:
 
       - name: Deploy docker compose to a pre-configured server
         id: deploy
-        uses: Autom3/docker-deployment-action@3.0.1
+        uses: TapTap21/docker-remote-deployment-action@v1.1
         with:
           remote_docker_host: ${{ secrets.DEMO_HOST }}
           ssh_private_key: ${{ secrets.SSH_PRIV_KEY }}
           ssh_public_key: ${{ secrets.SSH_KNOWN_HOSTS}}
-          deployment_mode: docker-compose
           stack_file_name: docker-compose.yml
-          pull_images_first: true
-          args: --env-file .env up -d
+          args: -p production --env-file .env up -d --remove-orphans
 
diff --git a/docker-compose.yml b/docker-compose.yml
index da1bf448..6453acd8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 version: "3"
 services:
-  videoroom_advanced:
+  videoroom:
     image: membraneframework/demo_webrtc_videoroom_advanced:${TAG:-latest}
     network_mode: "host"
     environment:
@@ -9,4 +9,4 @@ services:
       INTEGRATED_TURN_IP: "${INTEGRATED_TURN_IP:-127.0.0.1}"
       INTEGRATED_TURN_PORT_RANGE: "50000-65355"
       INTEGRATED_TCP_TURN_PORT: "49999"
-      
+