diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 26f8f139f..b9bc7b348 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -51,15 +51,15 @@ jobs:
 
       - name: Push
         id: push
-        uses: ./.github/actions/push
+        uses: ./.github/actions/push-frontend
         with:
-          artifact-name: frontend-build-development
-          artifact-bucket-name: ${{ vars.DEPLOYMENT_ARTIFACTS_BUCKET }}
-          container-repository-name: ${{ vars.FRONTEND_CONTAINER_REPOSITORY_NAME }}
-          deployment-role-arn: ${{ vars.DEPLOYMENT_ROLE_ARN }}
-          dynatrace-pass-token: ${{ secrets.DYNATRACE_PAAS_TOKEN }}
+          deployment-role-arn: ${{ vars.FRONTEND_DEPLOYMENT_ROLE_ARN }}
+          artifact-bucket-name: ${{ vars.FRONTEND_DEPLOYMENT_ARTIFACTS_BUCKET }}
           pipeline-name: ${{ vars.FRONTEND_PIPELINE_NAME }}
-          test-container-repository-name: ${{ vars.TEST_ECR_REPOSITORY_NAME }}
+          artifact-name: ${{ needs.build-frontend.outputs.artifact-name }}
+          dynatrace-pass-token: ${{ secrets.DYNATRACE_PAAS_TOKEN }}
+          container-repository-name: ${{ vars.FRONTEND_CONTAINER_REPOSITORY_NAME }}
+          test-container-repository-name: ${{ vars.FRONTEND_TEST_CONTAINER_REPOSITORY_NAME }}
 
   build-dynamo:
     if: github.event_name == 'merge_group'
@@ -84,19 +84,21 @@ jobs:
     if: github.event_name == 'merge_group'
     name: Deploy dynamodb
     runs-on: ubuntu-latest
+    environment:
+      name: development
+      url: ${{ steps.deploy.outputs.pipeline-url }}
     outputs:
-      stack-name: ${{ steps.build.outputs.stack-name }}
-      stack-url: ${{ steps.build.outputs.stack-url }}
+      pipeline-url: ${{ steps.deploy.outputs.pipeline-url }}
     steps:
       - name: Deploy
         id: deploy
         uses: govuk-one-login/github-actions/secure-pipelines/deploy-application@db4b3614f5f863f56a5356052262878ecec83b31 # 22/07/2024
         timeout-minutes: 15
         with:
-          aws-role-arn: ${{ vars.API_DEPLOYMENT_ROLE_ARN }}
-          artifact-bucket-name: ${{ vars.API_ARTIFACT_SOURCE_BUCKET_NAME }}
+          aws-role-arn: ${{ vars.DYNAMODB_DEPLOYMENT_ROLE_ARN }}
+          artifact-bucket-name: ${{ vars.DYNAMODB_DEPLOYMENT_ARTIFACTS_BUCKET }}
           signing-profile-name: ${{ vars.SIGNING_PROFILE_NAME }}
-          pipeline-name: ${{ vars.API_PIPELINE_NAME }}
+          pipeline-name: ${{ vars.DYNAMODB_PIPELINE_NAME }}
           artifact-name: ${{ needs.build-dynamodb.outputs.artifact-name }}
           template: .aws-sam/build/template.yaml
 
@@ -124,19 +126,21 @@ jobs:
     if: github.event_name == 'merge_group'
     name: Deploy cognito
     runs-on: ubuntu-latest
+    environment:
+      name: development
+      url: ${{ steps.deploy.outputs.pipeline-url }}
     outputs:
-      stack-name: ${{ steps.build.outputs.stack-name }}
-      stack-url: ${{ steps.build.outputs.stack-url }}
+      pipeline-url: ${{ steps.deploy.outputs.pipeline-url }}
     steps:
       - name: Deploy
         id: deploy
         uses: govuk-one-login/github-actions/secure-pipelines/deploy-application@db4b3614f5f863f56a5356052262878ecec83b31 # 22/07/2024
         timeout-minutes: 15
         with:
-          aws-role-arn: ${{ vars.API_DEPLOYMENT_ROLE_ARN }}
-          artifact-bucket-name: ${{ vars.API_ARTIFACT_SOURCE_BUCKET_NAME }}
+          aws-role-arn: ${{ vars.COGNITO_DEPLOYMENT_ROLE_ARN }}
+          artifact-bucket-name: ${{ vars.COGNITO_DEPLOYMENT_ARTIFACTS_BUCKET }}
           signing-profile-name: ${{ vars.SIGNING_PROFILE_NAME }}
-          pipeline-name: ${{ vars.API_PIPELINE_NAME }}
+          pipeline-name: ${{ vars.COGNITO_PIPELINE_NAME }}
           artifact-name: ${{ needs.build-cognito.outputs.artifact-name }}
           template: .aws-sam/build/template.yaml
 
@@ -165,9 +169,11 @@ jobs:
     if: github.event_name == 'merge_group'
     name: Deploy api
     runs-on: ubuntu-latest
+    environment:
+      name: development
+      url: ${{ steps.deploy.outputs.pipeline-url }}
     outputs:
-      stack-name: ${{ steps.build.outputs.stack-name }}
-      stack-url: ${{ steps.build.outputs.stack-url }}
+      pipeline-url: ${{ steps.deploy.outputs.pipeline-url }}
     steps:
       - name: Deploy
         id: deploy
@@ -175,7 +181,7 @@ jobs:
         timeout-minutes: 15
         with:
           aws-role-arn: ${{ vars.API_DEPLOYMENT_ROLE_ARN }}
-          artifact-bucket-name: ${{ vars.API_ARTIFACT_SOURCE_BUCKET_NAME }}
+          artifact-bucket-name: ${{ vars.API_DEPLOYMENT_ARTIFACTS_BUCKET }}
           signing-profile-name: ${{ vars.SIGNING_PROFILE_NAME }}
           pipeline-name: ${{ vars.API_PIPELINE_NAME }}
           artifact-name: ${{ needs.build-api.outputs.artifact-name }}