diff --git a/aws/cloud-formation/batchSystem/DEVbatchJobDefinition.json b/aws/cloud-formation/batchSystem/DEVbatchJobDefinition.json
index 0c7830cf49..ed906bd09a 100644
--- a/aws/cloud-formation/batchSystem/DEVbatchJobDefinition.json
+++ b/aws/cloud-formation/batchSystem/DEVbatchJobDefinition.json
@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::475079312496:role/DEV-batchSystem-BatchTaskRole-VGL42N9TANTI",
     "environment": [
       {
         "name": "containerCPU",
diff --git a/aws/cloud-formation/batchSystem/ProdBatchJobDefinition.json b/aws/cloud-formation/batchSystem/ProdBatchJobDefinition.json
index 78a16d7604..28f526df52 100644
--- a/aws/cloud-formation/batchSystem/ProdBatchJobDefinition.json
+++ b/aws/cloud-formation/batchSystem/ProdBatchJobDefinition.json
@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::920408837790:role/digiroad-batch-system-BatchTaskRole-NTGCBVRU7CCR",
     "environment": [
       {
         "name": "containerCPU",
diff --git a/aws/cloud-formation/batchSystem/QAbatchJobDefinition.json b/aws/cloud-formation/batchSystem/QAbatchJobDefinition.json
index fbc8ac3bf7..c6ef7c4c89 100644
--- a/aws/cloud-formation/batchSystem/QAbatchJobDefinition.json
+++ b/aws/cloud-formation/batchSystem/QAbatchJobDefinition.json
@@ -22,7 +22,7 @@
         "value": "4"
       }
     ],
-    "executionRoleArn": "arn:aws:iam::475079312496:role/batchSystem-BatchTaskRole-GSUD7E3H8KV4",
+    "executionRoleArn": "arn:aws:iam::475079312496:role/QA-batchSystem-BatchTaskRole-1QO0VDAJOYS45",
     "environment": [
       {
         "name": "containerCPU",
diff --git a/aws/cloud-formation/batchSystem/batchLambda/batchLambda.yaml b/aws/cloud-formation/batchSystem/batchLambda/batchLambda.yaml
index ac53186a1e..8885f34073 100644
--- a/aws/cloud-formation/batchSystem/batchLambda/batchLambda.yaml
+++ b/aws/cloud-formation/batchSystem/batchLambda/batchLambda.yaml
@@ -24,7 +24,7 @@ Resources:
     Type: AWS::Lambda::Function
     Properties:
       Code:
-        S3Bucket: !ImportValue 'batch-lambda-deployment-bucket'
+        S3Bucket: !Ref BucketName
         S3Key: !Ref S3ObjectKey
       Tags:
         - Key: Name
diff --git a/aws/cloud-formation/batchSystem/batchLambda/prod-batch-lambda-parameter.json b/aws/cloud-formation/batchSystem/batchLambda/prod-batch-lambda-parameter.json
index 3d4f1f370a..bb995914c7 100644
--- a/aws/cloud-formation/batchSystem/batchLambda/prod-batch-lambda-parameter.json
+++ b/aws/cloud-formation/batchSystem/batchLambda/prod-batch-lambda-parameter.json
@@ -1,11 +1,11 @@
 [
   {
     "ParameterKey": "BucketName",
-    "ParameterValue": "dev-batch-lambda-deployment-bucket"
+    "ParameterValue": "prod-batch-lambda-deployment-bucket"
   },
   {
     "ParameterKey": "S3ObjectKey",
-    "ParameterValue": "batch-lambda-deployment"
+    "ParameterValue": "deployment_package.zip"
   },
   {
     "ParameterKey": "EnvironmentName",
diff --git a/aws/cloud-formation/batchSystem/batchSystem.yaml b/aws/cloud-formation/batchSystem/batchSystem.yaml
index 61f5476456..37d4fbe23e 100644
--- a/aws/cloud-formation/batchSystem/batchSystem.yaml
+++ b/aws/cloud-formation/batchSystem/batchSystem.yaml
@@ -225,7 +225,7 @@ Resources:
       Name: !Join [ '-', [ !Ref EnvironmentName, 'batch-event-notify' ]]
       State: "ENABLED"
       Targets:
-        - Arn: !Join ['', ["arn:aws:sns:eu-west-1:475079312496:", !Ref EnvironmentName, '-', !Ref SNSTopicName]]
+        - Arn: !Join ['', ["arn:aws:sns:eu-west-1:", !Ref AWS::AccountId, ":", !Ref EnvironmentName, '-', !Ref SNSTopicName]]
           Id: "123321"
           InputTransformer:
             InputTemplate: |