diff --git a/.github/workflows/base-java-service-jobs.yml b/.github/workflows/base-java-service-jobs.yml
index 3bddde99..33e3bf94 100644
--- a/.github/workflows/base-java-service-jobs.yml
+++ b/.github/workflows/base-java-service-jobs.yml
@@ -21,6 +21,10 @@ on:
         type: string
         default: "21"
         required: false
+      image_prefix:
+        type: string
+        default: "deductions/"
+        required: false
 
 permissions:
   pull-requests: write
@@ -93,7 +97,7 @@ jobs:
         env:
           REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
-          REPOSITORY: deductions/${{ inputs.service }}
+          REPOSITORY: ${{inputs.image_prefix}}${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
@@ -109,7 +113,7 @@ jobs:
         env:
           REF_NAME: ${{ github.ref_name }}
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
-          REPOSITORY: deductions/${{ inputs.service }}
+          REPOSITORY: ${{ inputs.image_prefix }}${{ inputs.service }}
           IMAGE_TAG: ${{ github.sha }}
         run: |
           set -euo pipefail
diff --git a/.github/workflows/full-deployment.yml b/.github/workflows/full-deployment.yml
index 9874d45b..6e75f692 100644
--- a/.github/workflows/full-deployment.yml
+++ b/.github/workflows/full-deployment.yml
@@ -93,10 +93,11 @@ jobs:
     name: Re-registration Service CI
     uses: "./.github/workflows/base-java-service-jobs.yml"
     with:
-      service: ehr-transfer-service
+      service: re-registration-service
       environment: ${{ inputs.environment }}
       is_deployment: ${{ inputs.is_deployment }}
       requires_localstack: true
+      image_prefix: repo/
     secrets: inherit
 
   suspension-service:
@@ -107,6 +108,7 @@ jobs:
       environment: ${{ inputs.environment }}
       is_deployment: ${{ inputs.is_deployment }}
       requires_localstack: true
+      image_prefix: repo/
     secrets: inherit
 
   e2e-testing:
diff --git a/.github/workflows/service-ci.yml b/.github/workflows/service-ci.yml
index 948f26e5..f7c46bde 100644
--- a/.github/workflows/service-ci.yml
+++ b/.github/workflows/service-ci.yml
@@ -98,7 +98,7 @@ jobs:
   nems-event-processor:
     name: NEMs Event Processor CI
     needs: [get_changed_files]
-    if: contains(needs.get_changed_files.outputs.changed, 'services/nems-event-processor') || contains(needs.get_changed_files.outputs.changed, './github/')
+    if: contains(needs.get_changed_files.outputs.changed, 'services/nems-event-processor') || contains(needs.get_changed_files.outputs.changed, '.github/')
     uses: "./.github/workflows/base-java-service-jobs.yml"
     with:
       service: nems-event-processor
@@ -137,10 +137,11 @@ jobs:
     if: contains(needs.get_changed_files.outputs.changed, 'services/re-registration-service') || contains(needs.get_changed_files.outputs.changed, '.github/')
     uses: "./.github/workflows/base-java-service-jobs.yml"
     with:
-      service: ehr-transfer-service
+      service: re-registration-service
       environment: dev
       is_deployment: ${{ github.ref == 'refs/heads/main' }}
       requires_localstack: true
+      image_prefix: repo/
     secrets: inherit
 
   suspension-service:
@@ -153,6 +154,7 @@ jobs:
       environment: dev
       is_deployment: ${{ github.ref == 'refs/heads/main' }}
       requires_localstack: true
+      image_prefix: repo/
     secrets: inherit
 
   e2e-testing:
diff --git a/services/nems-event-processor/README.md b/services/nems-event-processor/README.md
index cc2d1cf6..4f5686c1 100644
--- a/services/nems-event-processor/README.md
+++ b/services/nems-event-processor/README.md
@@ -1,4 +1,3 @@
 # prm-deductions-nems-event-processor
 
-This component is a Java service that receives NEMS events when there is a change of GP for a patient in PDS (Personal Demographics Service). It processes each event to filter for relevant use cases and extracts important information from each, and forwards this information to another queue for further use.
-
+This component is a Java service that receives NEMS events when there is a change of GP for a patient in PDS (Personal Demographics Service). It processes each event to filter for relevant use cases and extracts important information from each, and forwards this information to another queue for further use.
\ No newline at end of file
diff --git a/services/re-registration-service/docker-compose.localstack-local.yaml b/services/re-registration-service/docker-compose.localstack-local.yaml
index 1003164c..1009e50f 100644
--- a/services/re-registration-service/docker-compose.localstack-local.yaml
+++ b/services/re-registration-service/docker-compose.localstack-local.yaml
@@ -12,4 +12,3 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
-      - "/var/run/docker.sock:/var/run/docker.sock"
diff --git a/services/re-registration-service/tasks b/services/re-registration-service/tasks
index 462b93c6..ad1858ad 100755
--- a/services/re-registration-service/tasks
+++ b/services/re-registration-service/tasks
@@ -79,11 +79,6 @@ function configure_sonar_environment_variable {
   export SONAR_TOKEN=$(_get_aws_ssm_secret "/repo/dev/output/re-registration-service/sonar_token")
 }
 
-function use_fake_aws_creds_for_localstack {
-  export AWS_ACCESS_KEY_ID=fake-key-id
-  export AWS_SECRET_ACCESS_KEY=fake-key
-}
-
 function destroy_localstack {
   echo docker processes running: $(docker ps)
 
@@ -130,7 +125,6 @@ case "${command}" in
       ;;
   test_integration)
       configure_envs
-      use_fake_aws_creds_for_localstack
       destroy_localstack
       ./gradlew --info integration
       ;;
@@ -145,15 +139,12 @@ case "${command}" in
       ;;
   test_all)
       configure_envs
-      use_fake_aws_creds_for_localstack
-      destroy_localstack
       ./gradlew test integration jacocoTestCoverageVerification check
       ;;
   run_sonar)
       configure_envs
       _assume_environment_role $NHS_ENVIRONMENT
       configure_sonar_environment_variable
-      use_fake_aws_creds_for_localstack
       destroy_localstack
       ./gradlew build sonar --info
       ;;