diff --git a/.github/actions/cloud-platform-deploy/action.yml b/.github/actions/cloud-platform-deploy/action.yml
index 2331c071fd..4f50995087 100644
--- a/.github/actions/cloud-platform-deploy/action.yml
+++ b/.github/actions/cloud-platform-deploy/action.yml
@@ -6,7 +6,7 @@ inputs:
     description: The project to deploy
     required: true
   environment:
-    description: The environment to deploy to (dev/preprod/prod)
+    description: The environment name to deploy to (test/preprod/prod)
     required: true
   version:
     description: The version of the service to deploy
diff --git a/.github/actions/render-project-template/action.yml b/.github/actions/render-project-template/action.yml
index 7f6679513b..bb6864bed0 100644
--- a/.github/actions/render-project-template/action.yml
+++ b/.github/actions/render-project-template/action.yml
@@ -31,7 +31,6 @@ runs:
         sed -i '/add new projects here/i \          - '"'"'["${{ inputs.project_name }}"]'"'"'' .github/workflows/access.yml
         sed -i '/add new projects here/i \          - '"'"'["${{ inputs.project_name }}"]'"'"'' .github/workflows/deploy.yml
         sed -i '/add new projects here/i \          - '"'"'["${{ inputs.project_name }}"]'"'"'' .github/workflows/docs.yml
-        sed -i '/add new projects here/i \          - ${{ inputs.project_name }}' .github/workflows/suppress-trivy.yml
         sed -i '/add new projects here/i \          - ${{ inputs.project_name }}' .github/workflows/build.yml
         sed -i '/add new projects here/i \* [${{ steps.project_name.outputs.title_case }}](https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/${{ inputs.project_name }})' doc/tech-docs/source/services.html.md.erb
         sed 's/$SERVICE_NAME/${{ inputs.project_name }}/g' templates/runConfiguration.xml > '.idea/runConfigurations/${{ steps.project_name.outputs.underscore }}.xml'
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f182b8623d..5eba8d6645 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -25,3 +25,8 @@ updates:
     directory: "/projects/person-search-index-from-delius/container"
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "docker"
+    directory: "/projects/redrive-dead-letter-queues/container"
+    schedule:
+      interval: "monthly" # to reduce frequency of AWS CLI updates
diff --git a/.github/workflows/access.yml b/.github/workflows/access.yml
index e37f854eb7..1ed88d41ed 100644
--- a/.github/workflows/access.yml
+++ b/.github/workflows/access.yml
@@ -12,21 +12,33 @@ on:
           - 'All'
           - '["approved-premises-and-delius"]'
           - '["approved-premises-and-oasys"]'
+          - '["arns-and-delius"]'
+          - '["assessment-summary-and-delius"]'
+          - '["cas3-and-delius"]'
           - '["court-case-and-delius"]'
           - '["create-and-vary-a-licence-and-delius"]'
           - '["custody-key-dates-and-delius"]'
           - '["domain-events-and-delius"]'
+          - '["dps-and-delius"]'
           - '["effective-proposal-framework-and-delius"]'
           - '["external-api-and-delius"]'
+          - '["hdc-licences-and-delius"]'
+          - '["hmpps-auth-and-delius"]'
           - '["make-recall-decisions-and-delius"]'
+          - '["manage-offences-and-delius"]'
           - '["manage-pom-cases-and-delius"]'
           - '["offender-events-and-delius"]'
+          - '["opd-and-delius"]'
           - '["pathfinder-and-delius"]'
           - '["person-search-index-from-delius"]'
           - '["pre-sentence-reports-to-delius"]'
           - '["prison-case-notes-to-probation"]'
           - '["prison-custody-status-to-delius"]'
+          - '["prison-education-and-delius"]'
+          - '["prison-identifier-and-delius"]'
+          - '["prisoner-profile-and-delius"]'
           - '["refer-and-monitor-and-delius"]'
+          - '["resettlement-passport-and-delius"]'
           - '["risk-assessment-scores-to-delius"]'
           - '["sentence-plan-and-delius"]'
           - '["sentence-plan-and-oasys"]'
@@ -34,18 +46,6 @@ on:
           - '["tier-to-delius"]'
           - '["unpaid-work-and-delius"]'
           - '["workforce-allocations-to-delius"]'
-          - '["manage-offences-and-delius"]'
-          - '["resettlement-passport-and-delius"]'
-          - '["prison-education-and-delius"]'
-          - '["opd-and-delius"]'
-          - '["hmpps-auth-and-delius"]'
-          - '["dps-and-delius"]'
-          - '["arns-and-delius"]'
-          - '["cas3-and-delius"]'
-          - '["hdc-licences-and-delius"]'
-          - '["prisoner-profile-and-delius"]'
-          - '["prison-identifier-and-delius"]'
-          - '["assessment-summary-and-delius"]'
           # ^ add new projects here
           # GitHub Actions doesn't support dynamic choices, we must add each project here to enable manual deployments
           # See https://github.com/community/community/discussions/11795
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 900f5869c1..ca1c7e0438 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,20 +36,32 @@ jobs:
         project:
           - approved-premises-and-delius
           - approved-premises-and-oasys
+          - arns-and-delius
+          - assessment-summary-and-delius
+          - cas3-and-delius
           - court-case-and-delius
           - create-and-vary-a-licence-and-delius
           - custody-key-dates-and-delius
           - domain-events-and-delius
+          - dps-and-delius
           - effective-proposal-framework-and-delius
           - external-api-and-delius
+          - hdc-licences-and-delius
+          - hmpps-auth-and-delius
           - make-recall-decisions-and-delius
+          - manage-offences-and-delius
           - manage-pom-cases-and-delius
           - offender-events-and-delius
+          - opd-and-delius
           - pathfinder-and-delius
           - pre-sentence-reports-to-delius
           - prison-case-notes-to-probation
           - prison-custody-status-to-delius
+          - prison-education-and-delius
+          - prison-identifier-and-delius
+          - prisoner-profile-and-delius
           - refer-and-monitor-and-delius
+          - resettlement-passport-and-delius
           - risk-assessment-scores-to-delius
           - sentence-plan-and-delius
           - sentence-plan-and-oasys
@@ -57,18 +69,6 @@ jobs:
           - tier-to-delius
           - unpaid-work-and-delius
           - workforce-allocations-to-delius
-          - manage-offences-and-delius
-          - resettlement-passport-and-delius
-          - prison-education-and-delius
-          - opd-and-delius
-          - hmpps-auth-and-delius
-          - dps-and-delius
-          - arns-and-delius
-          - cas3-and-delius
-          - hdc-licences-and-delius
-          - prisoner-profile-and-delius
-          - prison-identifier-and-delius
-          - assessment-summary-and-delius
           # ^ add new projects here
           # GitHub Actions doesn't support dynamic choices, we must add each project here to enable manual deployments
           # See https://github.com/community/community/discussions/11795
@@ -129,6 +129,7 @@ jobs:
       matrix:
         project:
           - person-search-index-from-delius
+          - redrive-dead-letter-queues
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c1bf151fb4..c22f54a0a5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,7 +8,7 @@ on:
         type: string
         required: true
       environment:
-        description: The name of the environment to deploy to
+        description: The environment name to deploy to (test/preprod/prod)
         type: string
         required: true
       version:
@@ -25,21 +25,34 @@ on:
         options:
           - '["approved-premises-and-delius"]'
           - '["approved-premises-and-oasys"]'
+          - '["arns-and-delius"]'
+          - '["assessment-summary-and-delius"]'
+          - '["cas3-and-delius"]'
           - '["court-case-and-delius"]'
           - '["create-and-vary-a-licence-and-delius"]'
           - '["custody-key-dates-and-delius"]'
           - '["domain-events-and-delius"]'
+          - '["dps-and-delius"]'
           - '["effective-proposal-framework-and-delius"]'
           - '["external-api-and-delius"]'
+          - '["hdc-licences-and-delius"]'
+          - '["hmpps-auth-and-delius"]'
           - '["make-recall-decisions-and-delius"]'
+          - '["manage-offences-and-delius"]'
           - '["manage-pom-cases-and-delius"]'
           - '["offender-events-and-delius"]'
+          - '["opd-and-delius"]'
           - '["pathfinder-and-delius"]'
           - '["person-search-index-from-delius"]'
           - '["pre-sentence-reports-to-delius"]'
           - '["prison-case-notes-to-probation"]'
           - '["prison-custody-status-to-delius"]'
+          - '["prison-education-and-delius"]'
+          - '["prison-identifier-and-delius"]'
+          - '["prisoner-profile-and-delius"]'
+          - '["redrive-dead-letter-queue"]'
           - '["refer-and-monitor-and-delius"]'
+          - '["resettlement-passport-and-delius"]'
           - '["risk-assessment-scores-to-delius"]'
           - '["sentence-plan-and-delius"]'
           - '["sentence-plan-and-oasys"]'
@@ -47,18 +60,6 @@ on:
           - '["tier-to-delius"]'
           - '["unpaid-work-and-delius"]'
           - '["workforce-allocations-to-delius"]'
-          - '["manage-offences-and-delius"]'
-          - '["resettlement-passport-and-delius"]'
-          - '["prison-education-and-delius"]'
-          - '["opd-and-delius"]'
-          - '["hmpps-auth-and-delius"]'
-          - '["dps-and-delius"]'
-          - '["arns-and-delius"]'
-          - '["cas3-and-delius"]'
-          - '["hdc-licences-and-delius"]'
-          - '["prisoner-profile-and-delius"]'
-          - '["prison-identifier-and-delius"]'
-          - '["assessment-summary-and-delius"]'
           # ^ add new projects here
           # GitHub Actions doesn't support dynamic choices, we must add each project here to enable manual deployments
           # See https://github.com/community/community/discussions/11795
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index f96c9c3797..687f99c5d7 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,21 +18,33 @@ on:
           - 'All'
           - '["approved-premises-and-delius"]'
           - '["approved-premises-and-oasys"]'
+          - '["arns-and-delius"]'
+          - '["assessment-summary-and-delius"]'
+          - '["cas3-and-delius"]'
           - '["court-case-and-delius"]'
           - '["create-and-vary-a-licence-and-delius"]'
           - '["custody-key-dates-and-delius"]'
           - '["domain-events-and-delius"]'
+          - '["dps-and-delius"]'
           - '["effective-proposal-framework-and-delius"]'
           - '["external-api-and-delius"]'
+          - '["hdc-licences-and-delius"]'
+          - '["hmpps-auth-and-delius"]'
           - '["make-recall-decisions-and-delius"]'
+          - '["manage-offences-and-delius"]'
           - '["manage-pom-cases-and-delius"]'
           - '["offender-events-and-delius"]'
+          - '["opd-and-delius"]'
           - '["pathfinder-and-delius"]'
           - '["person-search-index-from-delius"]'
           - '["pre-sentence-reports-to-delius"]'
           - '["prison-case-notes-to-probation"]'
           - '["prison-custody-status-to-delius"]'
+          - '["prison-education-and-delius"]'
+          - '["prison-identifier-and-delius"]'
+          - '["prisoner-profile-and-delius"]'
           - '["refer-and-monitor-and-delius"]'
+          - '["resettlement-passport-and-delius"]'
           - '["risk-assessment-scores-to-delius"]'
           - '["sentence-plan-and-delius"]'
           - '["sentence-plan-and-oasys"]'
@@ -40,18 +52,6 @@ on:
           - '["tier-to-delius"]'
           - '["unpaid-work-and-delius"]'
           - '["workforce-allocations-to-delius"]'
-          - '["manage-offences-and-delius"]'
-          - '["resettlement-passport-and-delius"]'
-          - '["prison-education-and-delius"]'
-          - '["opd-and-delius"]'
-          - '["hmpps-auth-and-delius"]'
-          - '["dps-and-delius"]'
-          - '["arns-and-delius"]'
-          - '["cas3-and-delius"]'
-          - '["hdc-licences-and-delius"]'
-          - '["prisoner-profile-and-delius"]'
-          - '["prison-identifier-and-delius"]'
-          - '["assessment-summary-and-delius"]'
           # ^ add new projects here
           # GitHub Actions doesn't support dynamic choices, we must add each project here to enable manual deployments
           # See https://github.com/community/community/discussions/11795
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get projects - all
         if: github.event_name != 'workflow_dispatch' || inputs.projects == 'All'
-        run: echo "projects=$(find projects -mindepth 1 -maxdepth 1 -printf "%f\n" | jq --raw-input . | jq --slurp --compact-output .)" | tee -a "$GITHUB_ENV"
+        run: echo "projects=$(cd projects && find . -name tech-docs -exec dirname {} \; | sed 's#^\./##' | jq --raw-input . | jq --slurp --compact-output .)" | tee -a "$GITHUB_ENV"
       - name: Get projects - selected
         if: github.event_name == 'workflow_dispatch' && inputs.projects != 'All'
         run: echo 'projects=${{ inputs.projects }}' | tee -a "$GITHUB_ENV"
diff --git a/.github/workflows/suppress-trivy.yml b/.github/workflows/suppress-trivy.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.idea/runConfigurations/domain-events-and-delius.xml b/.idea/runConfigurations/domain_events_and_delius.xml
similarity index 87%
rename from .idea/runConfigurations/domain-events-and-delius.xml
rename to .idea/runConfigurations/domain_events_and_delius.xml
index c51b587949..ac99a2e69c 100644
--- a/.idea/runConfigurations/domain-events-and-delius.xml
+++ b/.idea/runConfigurations/domain_events_and_delius.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="domain-events-and-delius" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev" />
-    <module name="probation-integration-services.approved-premises-and-delius.main" />
+    <module name="probation-integration-services.domain-events-and-delius.dev" />
     <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="uk.gov.justice.digital.hmpps.App" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/projects/domain-events-and-delius" />
diff --git a/projects/redrive-dead-letter-queues/README.md b/projects/redrive-dead-letter-queues/README.md
new file mode 100644
index 0000000000..ae4b47173d
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/README.md
@@ -0,0 +1,7 @@
+# Redrive Dead Letter Queues
+
+A simple CronJob that redrives SQS messages from DLQs back to the source queue.
+
+## References
+
+* https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-dead-letter-queue-redrive.html
\ No newline at end of file
diff --git a/projects/redrive-dead-letter-queues/container/Dockerfile b/projects/redrive-dead-letter-queues/container/Dockerfile
new file mode 100644
index 0000000000..a1155b7f21
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/container/Dockerfile
@@ -0,0 +1,15 @@
+FROM public.ecr.aws/aws-cli/aws-cli:2.15.5
+
+USER root
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+# hadolint ignore=DL3033
+RUN yum update -y && \
+    yum install -y shadow-utils jq && \
+    yum clean all && \
+    useradd --uid 1000 --create-home --system app && \
+    curl -sL https://sentry.io/get-cli/ | bash
+USER 1000
+
+COPY --chown=app /scripts /scripts
+
+ENTRYPOINT ["/scripts/startup.sh"]
diff --git a/projects/redrive-dead-letter-queues/container/scripts/redrive.sh b/projects/redrive-dead-letter-queues/container/scripts/redrive.sh
new file mode 100755
index 0000000000..06acff9c2b
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/container/scripts/redrive.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -euo pipefail
+eval "$(sentry-cli bash-hook --no-environ)"
+
+queue_urls=$(aws sqs list-queues --queue-name-prefix "probation-integration-$ENVIRONMENT" | jq -r '.QueueUrls[] | select(endswith("-dlq"))')
+
+for queue_url in $queue_urls
+do
+  echo "Redriving $queue_url"
+  queue_arn=$(aws sqs get-queue-attributes --attribute-names QueueArn --queue-url "$queue_url" --query Attributes.QueueArn --output text)
+  aws sqs start-message-move-task --source-arn "$queue_arn"
+done
\ No newline at end of file
diff --git a/projects/redrive-dead-letter-queues/container/scripts/startup.sh b/projects/redrive-dead-letter-queues/container/scripts/startup.sh
new file mode 100755
index 0000000000..c318ef5949
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/container/scripts/startup.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+eval "$(sentry-cli bash-hook --no-environ)"
+sentry-cli monitors run -e "$SENTRY_ENVIRONMENT" redrive-dead-letter-queues -- /scripts/redrive.sh
\ No newline at end of file
diff --git a/projects/redrive-dead-letter-queues/deploy/Chart.yaml b/projects/redrive-dead-letter-queues/deploy/Chart.yaml
new file mode 100644
index 0000000000..873dd72c26
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+appVersion: '1.0'
+description: A Helm chart for Kubernetes
+name: redrive-dead-letter-queues
+version: 1.0.0
diff --git a/projects/redrive-dead-letter-queues/deploy/templates/cronjob.yml b/projects/redrive-dead-letter-queues/deploy/templates/cronjob.yml
new file mode 100644
index 0000000000..a094438bc0
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/templates/cronjob.yml
@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: dlq-redrive
+spec:
+  schedule: {{ .Values.dlq_redrive.schedule }}
+  concurrencyPolicy: Replace
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: hmpps-probation-integration-services
+          containers:
+            - name: dlq-redrive
+              image: "ghcr.io/ministryofjustice/hmpps-probation-integration-services/redrive-dead-letter-queues:{{ .Values.version }}"
+              resources:
+                requests:
+                  memory: 100Mi
+                  cpu: "0.1"
+                limits:
+                  memory: 500Mi
+                  cpu: "1"
+              env:
+                - name: AWS_REGION
+                  value: eu-west-2
+                - name: ENVIRONMENT
+                  value: {{ .Values.dlq_redrive.environment }}
+                - name: SENTRY_ENVIRONMENT
+                  value: {{ .Values.dlq_redrive.environment }}
+                - name: SENTRY_DSN
+                  valueFrom:
+                    secretKeyRef:
+                      name: redrive-dead-letter-queues-sentry
+                      key: SENTRY_DSN
+                      optional: false
+                - name: SENTRY_AUTH_TOKEN
+                  valueFrom:
+                    secretKeyRef:
+                      name: redrive-dead-letter-queues-sentry
+                      key: SENTRY_AUTH_TOKEN
+                      optional: false
+          restartPolicy: Never
diff --git a/projects/redrive-dead-letter-queues/deploy/values-dev.yml b/projects/redrive-dead-letter-queues/deploy/values-dev.yml
new file mode 100644
index 0000000000..6a9ae2712f
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/values-dev.yml
@@ -0,0 +1,2 @@
+dlq_redrive:
+  environment: dev
diff --git a/projects/redrive-dead-letter-queues/deploy/values-preprod.yml b/projects/redrive-dead-letter-queues/deploy/values-preprod.yml
new file mode 100644
index 0000000000..5b98565996
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/values-preprod.yml
@@ -0,0 +1,2 @@
+dlq_redrive:
+  environment: preprod
diff --git a/projects/redrive-dead-letter-queues/deploy/values-prod.yml b/projects/redrive-dead-letter-queues/deploy/values-prod.yml
new file mode 100644
index 0000000000..1c8a6f2dae
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/values-prod.yml
@@ -0,0 +1,2 @@
+dlq_redrive:
+  environment: prod
diff --git a/projects/redrive-dead-letter-queues/deploy/values.yaml b/projects/redrive-dead-letter-queues/deploy/values.yaml
new file mode 100644
index 0000000000..5cd42c1522
--- /dev/null
+++ b/projects/redrive-dead-letter-queues/deploy/values.yaml
@@ -0,0 +1,2 @@
+dlq_redrive:
+  schedule: 30 5 * * 1 # Every Monday at 05:30 UTC
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ebe531f41f..006e8e0648 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,10 +1,10 @@
 rootProject.name = "probation-integration-services"
 include(
     // ⌄ add new projects here
-    "assessment-summary-and-delius",
     "approved-premises-and-delius",
     "approved-premises-and-oasys",
     "arns-and-delius",
+    "assessment-summary-and-delius",
     "cas3-and-delius",
     "court-case-and-delius",
     "create-and-vary-a-licence-and-delius",
@@ -25,9 +25,10 @@ include(
     "pre-sentence-reports-to-delius",
     "prison-case-notes-to-probation",
     "prison-custody-status-to-delius",
-    "prison-identifier-and-delius",
     "prison-education-and-delius",
+    "prison-identifier-and-delius",
     "prisoner-profile-and-delius",
+    "redrive-dead-letter-queues",
     "refer-and-monitor-and-delius",
     "resettlement-passport-and-delius",
     "risk-assessment-scores-to-delius",
diff --git a/templates/sqs.tf b/templates/sqs.tf
index c4d9c5fb55..3af89163a5 100644
--- a/templates/sqs.tf
+++ b/templates/sqs.tf
@@ -3,26 +3,28 @@ resource "aws_sns_topic_subscription" "SERVICE_NAME-queue-subscription" {
   protocol  = "sqs"
   endpoint  = module.SERVICE_NAME-queue.sqs_arn
   filter_policy = jsonencode({
-    eventType = [] # TODO add event type filter e.g ["queue.name"]
+    eventType = [] # TODO add event type filter e.g ["prison.case-note.published"]
   })
 }
 
 module "SERVICE_NAME-queue" {
   source                 = "github.com/ministryofjustice/cloud-platform-terraform-sqs?ref=5.0.0"
-  namespace              = var.namespace
-  team_name              = var.team_name
-  environment_name       = var.environment_name
-  infrastructure_support = var.infrastructure_support
-  is_production          = var.is_production
-  business_unit          = var.business_unit
-
-  application = "SERVICE_NAME"
-  sqs_name    = "SERVICE_NAME-queue"
 
+  # Queue configuration
+  sqs_name = "SERVICE_NAME-queue"
   redrive_policy = jsonencode({
     deadLetterTargetArn = module.SERVICE_NAME-dlq.sqs_arn
     maxReceiveCount     = 3
   })
+
+  # Tags
+  application            = "SERVICE_NAME"
+  business_unit          = var.business_unit
+  environment_name       = var.environment_name
+  infrastructure_support = var.infrastructure_support
+  is_production          = var.is_production
+  namespace              = var.namespace
+  team_name              = var.team_name
 }
 
 resource "aws_sqs_queue_policy" "SERVICE_NAME-queue-policy" {
@@ -32,15 +34,19 @@ resource "aws_sqs_queue_policy" "SERVICE_NAME-queue-policy" {
 
 module "SERVICE_NAME-dlq" {
   source                 = "github.com/ministryofjustice/cloud-platform-terraform-sqs?ref=5.0.0"
-  namespace              = var.namespace
-  team_name              = var.team_name
+
+  # Queue configuration
+  sqs_name                  = "SERVICE_NAME-dlq"
+  message_retention_seconds = 7 * 24 * 3600 # 1 week
+
+  # Tags
+  application   = "SERVICE_NAME"
+  business_unit = var.business_unit
   environment_name       = var.environment_name
   infrastructure_support = var.infrastructure_support
   is_production          = var.is_production
-  business_unit          = var.business_unit
-
-  application = "SERVICE_NAME"
-  sqs_name    = "SERVICE_NAME-dlq"
+  namespace     = var.namespace
+  team_name     = var.team_name
 }
 
 resource "aws_sqs_queue_policy" "SERVICE_NAME-dlq-policy" {