diff --git a/deploy/dockerephemeral/init.sh b/deploy/dockerephemeral/init.sh
index eec9c37226..659dc656be 100755
--- a/deploy/dockerephemeral/init.sh
+++ b/deploy/dockerephemeral/init.sh
@@ -16,35 +16,42 @@ while (! aws --endpoint-url=http://dynamodb:8000 --cli-connect-timeout=1 dynamod
     sleep 1;
 done
 echo " [ok!]"
-aws --endpoint-url=http://dynamodb:8000 dynamodb delete-table --table-name integration-brig-userkey-blacklist || true
-aws --endpoint-url=http://dynamodb:8000 dynamodb delete-table --table-name integration-brig-prekeys || true
-
-# Create Dynamo/SQS resources
-exec_until_ready "aws --endpoint-url=http://dynamodb:8000 dynamodb create-table --table-name integration-brig-userkey-blacklist --attribute-definitions AttributeName=key,AttributeType=S --key-schema AttributeName=key,KeyType=HASH --provisioned-throughput ReadCapacityUnits=5,WriteCapacityUnits=5"
-exec_until_ready "aws --endpoint-url=http://dynamodb:8000 dynamodb create-table --table-name integration-brig-prekeys --attribute-definitions AttributeName=client,AttributeType=S --key-schema AttributeName=client,KeyType=HASH --provisioned-throughput ReadCapacityUnits=5,WriteCapacityUnits=5"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-brig-events"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-brig-events --attributes VisibilityTimeout=1"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-brig-events-internal"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-brig-events-internal --attributes VisibilityTimeout=1"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-user-events.fifo"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-user-events.fifo --attributes VisibilityTimeout=1"
-# Gundeck's feedback queue
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-gundeck-events"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-gundeck-events --attributes VisibilityTimeout=1"
-# Galley's team event queue
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-team-events.fifo"
-exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-team-events.fifo --attributes VisibilityTimeout=1"
-# Verify sender's email address (ensure the sender address is in sync with the config in brig)
-exec_until_ready "aws --endpoint-url=http://ses:4579 ses verify-email-identity --email-address backend-integration@wire.com"
-
-# Create SNS resources for gundeck's notifications
-exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-test --platform GCM --attributes PlatformCredential=testkey"
-exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-test --platform APNS_SANDBOX --attributes PlatformCredential=testprivatekey"
-exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-com.wire.ent --platform APNS_SANDBOX --attributes PlatformCredential=testprivatekey"
-
-# Cargohold's bucket; creating a bucket is not idempotent so we just try once and wait until it is ready
-# TODO: Lifecycle configuration for the bucket, if supported.
-aws --endpoint-url=http://s3:9000 s3api create-bucket --bucket dummy-bucket
-aws --endpoint-url=http://s3:9000 s3api wait bucket-exists --bucket dummy-bucket
+
+for suffix in "" "2"; do
+    aws --endpoint-url=http://dynamodb:8000 dynamodb delete-table --table-name integration-brig-userkey-blacklist$suffix || true
+    aws --endpoint-url=http://dynamodb:8000 dynamodb delete-table --table-name integration-brig-prekeys$suffix || true
+
+    # Create Dynamo/SQS resources
+    exec_until_ready "aws --endpoint-url=http://dynamodb:8000 dynamodb create-table --table-name integration-brig-userkey-blacklist$suffix --attribute-definitions AttributeName=key,AttributeType=S --key-schema AttributeName=key,KeyType=HASH --provisioned-throughput ReadCapacityUnits=5,WriteCapacityUnits=5"
+    exec_until_ready "aws --endpoint-url=http://dynamodb:8000 dynamodb create-table --table-name integration-brig-prekeys$suffix --attribute-definitions AttributeName=client,AttributeType=S --key-schema AttributeName=client,KeyType=HASH --provisioned-throughput ReadCapacityUnits=5,WriteCapacityUnits=5"
+
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-brig-events$suffix"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-brig-events$suffix --attributes VisibilityTimeout=1"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-brig-events-internal$suffix"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-brig-events-internal$suffix --attributes VisibilityTimeout=1"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-user-events.fifo$suffix"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-user-events.fifo$suffix --attributes VisibilityTimeout=1"
+
+    # Gundeck's feedback queue
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-gundeck-events$suffix"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-gundeck-events$suffix --attributes VisibilityTimeout=1"
+
+    # Galley's team event queue
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs create-queue --queue-name integration-team-events.fifo$suffix"
+    exec_until_ready "aws --endpoint-url=http://sqs:4568 sqs set-queue-attributes --queue-url http://sqs:4568/integration-team-events.fifo$suffix --attributes VisibilityTimeout=1"
+
+    # Verify sender's email address (ensure the sender address is in sync with the config in brig)
+    exec_until_ready "aws --endpoint-url=http://ses:4579 ses verify-email-identity --email-address backend-integration$suffix@wire.com"
+
+    # Create SNS resources for gundeck's notifications
+    exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-test$suffix --platform GCM --attributes PlatformCredential=testkey"
+    exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-test$suffix --platform APNS_SANDBOX --attributes PlatformCredential=testprivatekey"
+    exec_until_ready "aws --endpoint-url=http://sns:4575 sns create-platform-application --name integration-com.wire.ent$suffix --platform APNS_SANDBOX --attributes PlatformCredential=testprivatekey"
+
+    # Cargohold's bucket; creating a bucket is not idempotent so we just try once and wait until it is ready
+    # TODO: Lifecycle configuration for the bucket, if supported.
+    aws --endpoint-url=http://s3:9000 s3api create-bucket --bucket "dummy-bucket$suffix"
+    aws --endpoint-url=http://s3:9000 s3api wait bucket-exists --bucket "dummy-bucket$suffix"
+done
 
 echo 'AWS resources created successfully!'
diff --git a/services/run-services b/services/run-services
index fd3dd7b60f..df406112ba 100755
--- a/services/run-services
+++ b/services/run-services
@@ -182,6 +182,26 @@ class Instance:
         if 'remoteDomains' in data:
             data['remoteDomains'] = remoteDomains
 
+        if 'aws' in data:
+            if 'userJournalQueue' in data['aws']:
+                data['aws']['userJournalQueue'] = f"integration-user-events.fifo{suffix}"
+            if 'prekeyTable' in data['aws']:
+                data['aws']['prekeyTable'] = f"integration-brig-prekeys{suffix}"
+            if 's3Bucket' in data['aws']:
+                data['aws']['s3Bucket'] = f"dummy-bucket{suffix}"
+            if 'queueName' in data['aws']:
+                data['aws']['queueName'] = f"integration-gundeck-events{suffix}"
+
+        if 'internalEvents' in data and 'queueName' in data['internalEvents']:
+            data['internalEvents']['queueName'] = f"integration-brig-events-internal{suffix}"
+
+        if 'emailSMS' in data:
+            data['emailSMS']['email']['sesQueue'] = f"integration-brig-events{suffix}"
+            data['emailSMS']['general']['emailSender'] = f"backend-integration{suffix}@wire.com"
+
+        if 'journal' in data:
+            data['journal']['queueName'] = f"integration-team-events.fifo{suffix}"
+
         # set log level
         if self.service.level is not None:
             if 'logLevel' in data: