diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.demo.cloudflare.pre.yml b/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.cloudflare.pre.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.demo.cloudflare.pre.yml
rename to .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.cloudflare.pre.yml
diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.demo.template.yml b/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.demo.template.yml
rename to .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml
diff --git a/.deploy/ssh/with-cloudflare/nginx.demo.pre.cloudflare.conf b/.deploy/ssh/with-cloudflare/demo/nginx.demo.pre.cloudflare.conf
similarity index 100%
rename from .deploy/ssh/with-cloudflare/nginx.demo.pre.cloudflare.conf
rename to .deploy/ssh/with-cloudflare/demo/nginx.demo.pre.cloudflare.conf
diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.prod.cloudflare.pre.yml b/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.cloudflare.pre.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.prod.cloudflare.pre.yml
rename to .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.cloudflare.pre.yml
diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.prod.template.yml b/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.prod.template.yml
rename to .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml
diff --git a/.deploy/ssh/with-cloudflare/nginx.prod.pre.cloudflare.conf b/.deploy/ssh/with-cloudflare/prod/nginx.prod.pre.cloudflare.conf
similarity index 100%
rename from .deploy/ssh/with-cloudflare/nginx.prod.pre.cloudflare.conf
rename to .deploy/ssh/with-cloudflare/prod/nginx.prod.pre.cloudflare.conf
diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.stage.cloudflare.pre.yml b/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.cloudflare.pre.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.stage.cloudflare.pre.yml
rename to .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.cloudflare.pre.yml
diff --git a/.deploy/ssh/with-cloudflare/docker-compose.api.stage.template.yml b/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml
similarity index 100%
rename from .deploy/ssh/with-cloudflare/docker-compose.api.stage.template.yml
rename to .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml
diff --git a/.deploy/ssh/with-cloudflare/nginx.stage.pre.cloudflare.conf b/.deploy/ssh/with-cloudflare/stage/nginx.stage.pre.cloudflare.conf
similarity index 100%
rename from .deploy/ssh/with-cloudflare/nginx.stage.pre.cloudflare.conf
rename to .deploy/ssh/with-cloudflare/stage/nginx.stage.pre.cloudflare.conf
diff --git a/.github/workflows/deploy-do-droplet-demo.yml b/.github/workflows/deploy-do-droplet-demo.yml
index 14ff33cef62..4a96f17244d 100644
--- a/.github/workflows/deploy-do-droplet-demo.yml
+++ b/.github/workflows/deploy-do-droplet-demo.yml
@@ -32,11 +32,11 @@ jobs:
       - name: Inject secrets into .env-template.compose
         run: |        
           if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then  
-            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.demo.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.demo.yml
+            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.yml
             touch $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.yml
           elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
             envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.yml
-            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.demo.yml          
+            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.yml          
           else
             echo "UNKNOWN INGRESS_CERT_TYPE"
           fi        
@@ -147,7 +147,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_DEMO_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.demo.yml'
+          source: '.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.yml'
           target: '.'
       - name: Copy file via scp - with-letsencrypt
         if: ${{ env.INGRESS_CERT_TYPE == 'letsencrypt' }}
@@ -198,9 +198,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.demo.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.demo.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"
diff --git a/.github/workflows/deploy-do-droplet-pre-demo.yml b/.github/workflows/deploy-do-droplet-pre-demo.yml
index 2c342f49051..80e8527d6c6 100644
--- a/.github/workflows/deploy-do-droplet-pre-demo.yml
+++ b/.github/workflows/deploy-do-droplet-pre-demo.yml
@@ -23,9 +23,9 @@ jobs:
 
       - name: Generate TLS Secrets for DO Droplet
         run: |
-          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
-          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt
-          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
+          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/ingress.api.key
+          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/ingress.api.crt
+          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/demo/ingress.api.key
 
       - name: Copy file via scp
         uses: appleboy/scp-action@master
@@ -33,7 +33,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_DEMO_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.demo.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/nginx.demo.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/demo/user_conf.d,.deploy/ssh/with-letsencrypt/demo/nginx-certbot.env,.deploy/ssh/with-cloudflare/ingress.api.crt,.deploy/ssh/with-cloudflare/ingress.api.key'
+          source: '.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/demo/nginx.demo.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/demo/user_conf.d,.deploy/ssh/with-letsencrypt/demo/nginx-certbot.env,.deploy/ssh/with-cloudflare/demo/ingress.api.crt,.deploy/ssh/with-cloudflare/demo/ingress.api.key'
           target: '.'
       - name: Install Docker
         uses: appleboy/ssh-action@master
@@ -74,9 +74,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.letsencrypt.pre.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.demo.cloudflare.pre.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.cloudflare.pre.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.demo.cloudflare.pre.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.cloudflare.pre.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.letsencrypt.pre.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"
diff --git a/.github/workflows/deploy-do-droplet-pre-prod.yml b/.github/workflows/deploy-do-droplet-pre-prod.yml
index d82a5088a38..20c6c173640 100644
--- a/.github/workflows/deploy-do-droplet-pre-prod.yml
+++ b/.github/workflows/deploy-do-droplet-pre-prod.yml
@@ -23,9 +23,9 @@ jobs:
 
       - name: Generate TLS Secrets for DO Droplet
         run: |
-          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
-          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt
-          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
+          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/ingress.api.key
+          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/ingress.api.crt
+          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/ingress.api.key
 
       - name: Copy file via scp
         uses: appleboy/scp-action@master
@@ -33,7 +33,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_PROD_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.prod.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/nginx.prod.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/prod/user_conf.d,.deploy/ssh/with-letsencrypt/prod/nginx-certbot.env,.deploy/ssh/with-cloudflare/ingress.api.crt,.deploy/ssh/with-cloudflare/ingress.api.key'
+          source: '.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/prod/nginx.prod.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/prod/user_conf.d,.deploy/ssh/with-letsencrypt/prod/nginx-certbot.env,.deploy/ssh/with-cloudflare/prod/ingress.api.crt,.deploy/ssh/with-cloudflare/prod/ingress.api.key'
           target: '.'
       - name: Install Docker
         uses: appleboy/ssh-action@master
@@ -74,9 +74,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.letsencrypt.pre.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.prod.cloudflare.pre.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.cloudflare.pre.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.prod.cloudflare.pre.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.cloudflare.pre.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.letsencrypt.pre.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"
diff --git a/.github/workflows/deploy-do-droplet-pre-stage.yml b/.github/workflows/deploy-do-droplet-pre-stage.yml
index aaa32dbffd3..f7575285e4a 100644
--- a/.github/workflows/deploy-do-droplet-pre-stage.yml
+++ b/.github/workflows/deploy-do-droplet-pre-stage.yml
@@ -23,9 +23,9 @@ jobs:
 
       - name: Generate TLS Secrets for DO Droplet
         run: |
-          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
-          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.crt
-          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/ingress.api.key
+          rm -f $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/ingress.api.crt $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/ingress.api.key
+          echo ${{ secrets.INGRESS_API_CERT }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/ingress.api.crt
+          echo ${{ secrets.INGRESS_API_CERT_KEY }} | base64 --decode > $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/ingress.api.key
 
       - name: Copy file via scp
         uses: appleboy/scp-action@master
@@ -33,7 +33,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_STAGE_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.stage.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/nginx.stage.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/stage/user_conf.d,.deploy/ssh/with-letsencrypt/stage/nginx-certbot.env,.deploy/ssh/with-cloudflare/ingress.api.crt,.deploy/ssh/with-cloudflare/ingress.api.key'
+          source: '.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.cloudflare.pre.yml,.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.letsencrypt.pre.yml,.deploy/ssh/with-cloudflare/stage/nginx.stage.pre.cloudflare.conf,.deploy/ssh/with-letsencrypt/stage/user_conf.d,.deploy/ssh/with-letsencrypt/stage/nginx-certbot.env,.deploy/ssh/with-cloudflare/stage/ingress.api.crt,.deploy/ssh/with-cloudflare/stage/ingress.api.key'
           target: '.'
       - name: Install Docker
         uses: appleboy/ssh-action@master
@@ -74,9 +74,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.letsencrypt.pre.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.stage.cloudflare.pre.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.cloudflare.pre.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.stage.cloudflare.pre.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.cloudflare.pre.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.letsencrypt.pre.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"
diff --git a/.github/workflows/deploy-do-droplet-prod.yml b/.github/workflows/deploy-do-droplet-prod.yml
index 8a50f19b84e..cb162d97252 100644
--- a/.github/workflows/deploy-do-droplet-prod.yml
+++ b/.github/workflows/deploy-do-droplet-prod.yml
@@ -32,11 +32,11 @@ jobs:
       - name: Inject secrets into .env-template.compose
         run: |        
           if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then  
-            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.prod.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.prod.yml
+            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.yml
             touch $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.yml
           elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
             envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.yml
-            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.prod.yml          
+            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.yml          
           else
             echo "UNKNOWN INGRESS_CERT_TYPE"
           fi        
@@ -147,7 +147,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_PROD_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.prod.yml'
+          source: '.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.yml'
           target: '.'
       - name: Copy file via scp - with-letsencrypt
         if: ${{ env.INGRESS_CERT_TYPE == 'letsencrypt' }}
@@ -198,9 +198,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.prod.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.prod.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"
diff --git a/.github/workflows/deploy-do-droplet-stage.yml b/.github/workflows/deploy-do-droplet-stage.yml
index a9dce0c5a5b..22e9d628ba0 100644
--- a/.github/workflows/deploy-do-droplet-stage.yml
+++ b/.github/workflows/deploy-do-droplet-stage.yml
@@ -32,11 +32,11 @@ jobs:
       - name: Inject secrets into .env-template.compose
         run: |        
           if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then  
-            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.stage.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.stage.yml
+            envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.yml
             touch $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.yml
           elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
             envsubst < $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.template.yml > temp.yaml && mv temp.yaml $GITHUB_WORKSPACE/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.yml
-            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/docker-compose.api.stage.yml          
+            touch $GITHUB_WORKSPACE/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.yml          
           else
             echo "UNKNOWN INGRESS_CERT_TYPE"
           fi        
@@ -147,7 +147,7 @@ jobs:
           host: ${{secrets.DO_DROPLET_STAGE_HOST}}
           username: ${{secrets.DO_DROPLET_USERNAME}}
           key: ${{secrets.DO_DROPLET_KEY}}
-          source: '.deploy/ssh/with-cloudflare/docker-compose.api.stage.yml'
+          source: '.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.yml'
           target: '.'
       - name: Copy file via scp - with-letsencrypt
         if: ${{ env.INGRESS_CERT_TYPE == 'letsencrypt' }}
@@ -198,9 +198,9 @@ jobs:
           script: |
             if [ "${{ env.INGRESS_CERT_TYPE }}" = "cloudflare" ]; then
                 docker-compose -f .deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.yml down
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.stage.yml up -d
+                docker-compose -f .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.yml up -d
             elif [ "${{ env.INGRESS_CERT_TYPE }}" = "letsencrypt" ]; then
-                docker-compose -f .deploy/ssh/with-cloudflare/docker-compose.api.stage.yml down
+                docker-compose -f .deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.yml down
                 docker-compose -f .deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.yml up -d
             else
                 echo "Unknown INGRESS_CERT_TYPE: $INGRESS_CERT_TYPE"