diff --git a/.github/workflows/.deploy-app.yml b/.github/workflows/.deploy-app.yml
new file mode 100644
index 0000000..2f34ecd
--- /dev/null
+++ b/.github/workflows/.deploy-app.yml
@@ -0,0 +1,83 @@
+name: Deploy application to AWS
+
+on:
+  workflow_call:
+    inputs:
+      environment_name:
+        description: 'The name of the environment to deploy to'
+        required: true
+        type: string
+      app_env:
+        required: true
+        description: 'The APP env separates between AWS ENV and Actual APP, since AWS dev is where PR, and TEST is deployed'
+        type: string
+
+env:
+    AWS_REGION: ca-central-1
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: write # This is required for actions/checkout
+  packages: write
+  pull-requests: write
+
+jobs:
+  # https://github.com/bcgov/quickstart-openshift-helpers
+  deploy-db:
+    name: Deploys Database
+    uses: ./.github/workflows/.aws-deployer.yml
+    with:
+      environment_name: ${{ inputs.environment_name }}
+      command: apply
+      working_directory: database
+      app_env: ${{ inputs.app_env }}
+    secrets: inherit
+  deploy-api:
+    name: Deploys API
+    needs: [deploy-db]
+    uses: ./.github/workflows/.aws-deployer.yml
+    with:
+      environment_name: ${{ inputs.environment_name }}
+      command: apply
+      working_directory: api
+      tag: ${{ needs.vars.outputs.pr }}
+      app_env: ${{ inputs.app_env }}
+    secrets: inherit
+  deploy-cloudfront:
+    name: Deploys Cloudfront
+    uses: ./.github/workflows/.aws-deployer.yml
+    with:
+      environment_name: ${{ inputs.environment_name }}
+      command: apply
+      working_directory: frontend
+      app_env: ${{ inputs.app_env }}
+    secrets: inherit
+  build-ui:
+    name: Builds UI
+    needs: [deploy-api, deploy-cloudfront]
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+            role-to-assume: ${{ secrets.AWS_DEPLOY_ROLE_ARN }}
+            aws-region: ${{ env.AWS_REGION }}
+      - name: Build And Update UI (CF)
+        working-directory: frontend
+        env:
+          VITE_API_BASE_URL: ${{ needs.deploy-api.outputs.API_GW_URL }}/api
+          S3_BUCKET_ARN: ${{ needs.deploy-cloudfront.outputs.S3_BUCKET_ARN }}
+          CF_DISTRIBUTION_ID: ${{ needs.deploy-cloudfront.outputs.CF_DISTRIBUTION_ID }}
+        run: |
+          npm run deploy
+          aws s3 sync --delete ./dist s3://$(echo "$S3_BUCKET_ARN" | cut -d: -f6)
+          aws cloudfront create-invalidation --distribution-id $CF_DISTRIBUTION_ID --paths "/*"
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index a243d6f..b0c0803 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -19,13 +19,6 @@ concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: false
 
-permissions:
-  id-token: write # This is required for requesting the JWT
-  contents: write # This is required for actions/checkout
-  packages: write
-  pull-requests: write
-env:
-    AWS_REGION: ca-central-1
 jobs:
   vars:
     name: Set Variables
@@ -69,71 +62,18 @@ jobs:
   #       --set frontend.pdb.enabled=true
   #       --set backend.pdb.enabled=true
 
-  # https://github.com/bcgov/quickstart-openshift-helpers
-  deploy-db:
+  deploy-to-aws-dev:
     needs: [vars]
-    name: Deploys Database
-    uses: ./.github/workflows/.aws-deployer.yml
+    name: Deploys Application to AWS dev
+    uses: ./.github/workflows/.deploy-app.yml
     with:
       environment_name: dev
-      command: apply
-      working_directory: database
       app_env: dev
     secrets: inherit
-  deploy-api:
-    name: Deploys API
-    needs: [vars,deploy-db]
-    uses: ./.github/workflows/.aws-deployer.yml
-    with:
-      environment_name: dev
-      command: apply
-      working_directory: api
-      tag: ${{ needs.vars.outputs.pr }}
-      app_env: dev
-    secrets: inherit
-  deploy-cloudfront:
-    name: Deploys Cloudfront
-    needs: [vars]
-    uses: ./.github/workflows/.aws-deployer.yml
-    with:
-      environment_name: dev
-      command: apply
-      working_directory: frontend
-      app_env: dev
-    secrets: inherit
-  build-ui:
-    name: Builds UI
-    needs: [deploy-api, deploy-cloudfront]
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-            role-to-assume: ${{ secrets.AWS_DEPLOY_ROLE_ARN }}
-            aws-region: ${{ env.AWS_REGION }}
-      - name: Build And Update UI (CF)
-        working-directory: frontend
-        env:
-          VITE_API_BASE_URL: ${{ needs.deploy-api.outputs.API_GW_URL }}/api
-          S3_BUCKET_ARN: ${{ needs.deploy-cloudfront.outputs.S3_BUCKET_ARN }}
-          CF_DISTRIBUTION_ID: ${{ needs.deploy-cloudfront.outputs.CF_DISTRIBUTION_ID }}
-        run: |
-          npm run deploy
-          aws s3 sync --delete ./dist s3://$(echo "$S3_BUCKET_ARN" | cut -d: -f6)
-          aws cloudfront create-invalidation --distribution-id $CF_DISTRIBUTION_ID --paths "/*"
 
   promote:
     name: Promote Images
-    needs: [deploy-api, vars]
+    needs: [deploy-to-aws-dev, vars]
     runs-on: ubuntu-24.04
     permissions:
       packages: write