diff --git a/.github/workflows/migration-db-deploy.yml b/.github/workflows/migration-db-deploy.yml
index b3e6cf77..e47e667a 100644
--- a/.github/workflows/migration-db-deploy.yml
+++ b/.github/workflows/migration-db-deploy.yml
@@ -11,6 +11,10 @@ on:
     paths:
       - 'packages/domain/prisma/migrations/**'
 
+env:
+  PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
+  PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
+
 jobs:
   apply-migration:
     runs-on: ubuntu-latest
@@ -23,50 +27,39 @@ jobs:
       - name: Set database branch name
         run: echo "PSCALE_BRANCH_NAME=$(echo ${{ github.head_ref }} | tr -cd '[:alnum:]-'| tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
-      - name: Get the deploy request number in development branch
-        env:
-          PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
-          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
-        run: |
-          DEV_DEPLOY_REQUEST_NUMBER=$(pscale deploy-request show ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.PSCALE_BRANCH_NAME }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} -f json | jq -r '.number')
-          echo "DEV_DEPLOY_REQUEST_NUMBER=$DEV_DEPLOY_REQUEST_NUMBER" >> $GITHUB_ENV
-
-      - name: Check deployment state
-        continue-on-error: false
-        env:
-          PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
-          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
-        run: |
-          for i in {1..10}; do
-            DEPLOYMENT_STATE=$(pscale deploy-request show ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.DEV_DEPLOY_REQUEST_NUMBER }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} -f json | jq -r '.deployment_state')
-            echo "Deployment State: $DEPLOYMENT_STATE"
-
-            if [ "$DEPLOYMENT_STATE" = "ready" ]; then
-              echo "Deployment state is ready. Continuing."
-              echo "DEPLOY_REQUEST_OPENED=true" >> $GITHUB_ENV
-              break
-            fi
-
-            echo "Deployment state is not ready. Waiting 2 seconds before checking again."
-            sleep 2
-          done
-
-      - name: Deploy schema migration in the development branch
-        continue-on-error: false
-        env:
-          PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
-          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
-        run: |
-          pscale deploy-request deploy ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.DEV_DEPLOY_REQUEST_NUMBER }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} --wait
+#      - name: Get the deploy request number in development branch
+#        run: |
+#          DEV_DEPLOY_REQUEST_NUMBER=$(pscale deploy-request show ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.PSCALE_BRANCH_NAME }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} -f json | jq -r '.number')
+#          echo "DEV_DEPLOY_REQUEST_NUMBER=$DEV_DEPLOY_REQUEST_NUMBER" >> $GITHUB_ENV
+#
+#      - name: Check deployment state
+#        continue-on-error: false
+#        run: |
+#          for i in {1..10}; do
+#            DEPLOYMENT_STATE=$(pscale deploy-request show ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.DEV_DEPLOY_REQUEST_NUMBER }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} -f json | jq -r '.deployment_state')
+#            echo "Deployment State: $DEPLOYMENT_STATE"
+#
+#            if [ "$DEPLOYMENT_STATE" = "ready" ]; then
+#              echo "Deployment state is ready. Continuing."
+#              echo "DEPLOY_REQUEST_OPENED=true" >> $GITHUB_ENV
+#              break
+#            fi
+#
+#            echo "Deployment state is not ready. Waiting 2 seconds before checking again."
+#            sleep 2
+#          done
+#
+#      - name: Deploy schema migration in the development branch
+#        continue-on-error: false
+#        run: |
+#          pscale deploy-request deploy ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.DEV_DEPLOY_REQUEST_NUMBER }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} --wait
 
       - name: Deploy schema migration in the production branch
         if: ${{ success() }}
         continue-on-error: false
-        env:
-          PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
-          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
         run: |
           pscale deploy-request create ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.PSCALE_BRANCH_NAME }} \
+          --org ${{ secrets.PLANETSCALE_ORG_NAME }} \
           --into main \
           --notes "Apply changes to the production branch"
 
@@ -89,9 +82,8 @@ jobs:
 
       - name: Delete the database branch
         if: ${{ success() }}
-        env:
-          PLANETSCALE_SERVICE_TOKEN_ID: ${{ secrets.PLANETSCALE_SERVICE_TOKEN_ID }}
-          PLANETSCALE_SERVICE_TOKEN: ${{ secrets.PLANETSCALE_SERVICE_TOKEN }}
         run: |
+          PROD_DEPLOY_REQUEST_NUMBER=$(pscale deploy-request show ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.PSCALE_BRANCH_NAME }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} -f json | jq -r '.number')
+          pscale deploy-request skip-revert ${{ secrets.PLANETSCALE_DATABASE_NAME }} $PROD_DEPLOY_REQUEST_NUMBER --org ${{ secrets.PLANETSCALE_ORG_NAME }}
           pscale branch delete ${{ secrets.PLANETSCALE_DATABASE_NAME }} ${{ env.PSCALE_BRANCH_NAME }} --org ${{ secrets.PLANETSCALE_ORG_NAME }} --force
           echo "The branch \"${{ env.PSCALE_BRANCH_NAME }}\" has been successfully."