diff --git a/charts/fake-aws-ses/Chart.yaml b/charts/fake-aws-ses/Chart.yaml
index 0d57fc77bea..2c5ef480a87 100644
--- a/charts/fake-aws-ses/Chart.yaml
+++ b/charts/fake-aws-ses/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
-description: Dummy ephemeral SES service (based on localstack)
+description: Dummy ephemeral SES service (based on Moto)
 name: fake-aws-ses
 version: 0.0.42
diff --git a/charts/fake-aws-ses/templates/deployment.yaml b/charts/fake-aws-ses/templates/deployment.yaml
index cb972a5a7b0..643a9e90789 100644
--- a/charts/fake-aws-ses/templates/deployment.yaml
+++ b/charts/fake-aws-ses/templates/deployment.yaml
@@ -28,19 +28,12 @@ spec:
       - name: fake-aws-ses
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         env:
-          - name: DEBUG
-            value: "1"
-          - name: DEFAULT_REGION
-            value: "eu-west-1"
-          - name: SERVICES
-            value: "ses"
+          - name: MOTO_PORT
+            value: "{{ .Values.service.internalPort }}"
         ports:
         - containerPort: {{ .Values.service.internalPort }}
           name: http
           protocol: TCP
-        volumeMounts:
-        - name: storage
-          mountPath: /data
         resources:
 {{ toYaml .Values.resources | indent 12 }}
       - name: initiate-fake-aws-ses
@@ -71,6 +64,3 @@ spec:
               fi
               sleep 10
           done
-      volumes:
-        - emptyDir: {}
-          name: "storage"
diff --git a/charts/fake-aws-ses/values.yaml b/charts/fake-aws-ses/values.yaml
index 42f3323b7dc..f1dffb7a35f 100644
--- a/charts/fake-aws-ses/values.yaml
+++ b/charts/fake-aws-ses/values.yaml
@@ -1,10 +1,10 @@
 image:
-  repository: localstack/localstack
-  tag: 0.8.7
+  repository: motoserver/moto
+  tag: 5.1.22
 
 awsCliImage:
-  repository: mesosphere/aws-cli
-  tag: 1.14.5
+  repository: amazon/aws-cli
+  tag: 2.34.7
 
 service:
   internalPort: 4579
diff --git a/charts/fake-aws-sns/Chart.yaml b/charts/fake-aws-sns/Chart.yaml
index 870be585584..a9068d41b6b 100644
--- a/charts/fake-aws-sns/Chart.yaml
+++ b/charts/fake-aws-sns/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
-description: Dummy ephemeral SNS service (based on localstack)
+description: Dummy ephemeral SNS service (based on Moto)
 name: fake-aws-sns
 version: 0.0.42
diff --git a/charts/fake-aws-sns/templates/deployment.yaml b/charts/fake-aws-sns/templates/deployment.yaml
index d85b4770d36..61f7bb92c67 100644
--- a/charts/fake-aws-sns/templates/deployment.yaml
+++ b/charts/fake-aws-sns/templates/deployment.yaml
@@ -28,19 +28,12 @@ spec:
       - name: fake-aws-sns
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         env:
-          - name: DEBUG
-            value: "1"
-          - name: DEFAULT_REGION
-            value: "eu-west-1"
-          - name: SERVICES
-            value: "sns"
+          - name: MOTO_PORT
+            value: "{{ .Values.service.internalPort }}"
         ports:
         - containerPort: {{ .Values.service.internalPort }}
           name: http
           protocol: TCP
-        volumeMounts:
-        - name: storage
-          mountPath: /data
         resources:
 {{ toYaml .Values.resources | indent 12 }}
       - name: initiate-fake-aws-sns
@@ -73,6 +66,3 @@ spec:
               echo "Resources created, sleeping for 10, to keep this container (and thus the pod) alive"
               sleep 10
           done
-      volumes:
-        - emptyDir: {}
-          name: "storage"
diff --git a/charts/fake-aws-sns/values.yaml b/charts/fake-aws-sns/values.yaml
index 823b80371dd..730fb7cd21e 100644
--- a/charts/fake-aws-sns/values.yaml
+++ b/charts/fake-aws-sns/values.yaml
@@ -1,10 +1,10 @@
 image:
-  repository: localstack/localstack
-  tag: 0.8.7
+  repository: motoserver/moto
+  tag: 5.1.22
 
 awsCliImage:
-  repository: mesosphere/aws-cli
-  tag: 1.14.5
+  repository: amazon/aws-cli
+  tag: 2.34.7
 
 service:
   internalPort: 4575
diff --git a/deploy/dockerephemeral/docker-compose.yaml b/deploy/dockerephemeral/docker-compose.yaml
index f96f794b019..d59e3cd2b56 100644
--- a/deploy/dockerephemeral/docker-compose.yaml
+++ b/deploy/dockerephemeral/docker-compose.yaml
@@ -42,17 +42,23 @@ services:
     networks:
       - demo_wire
 
-  fake_localstack:
-    container_name: demo_wire_localstack
-    #    image: localstack/localstack:0.8.0  # NB: this is younger than 0.8.6!
-    image: quay.io/wire/localstack:0.0.9
+  fake_sns:
+    container_name: demo_wire_sns
+    image: motoserver/moto:5.1.22
     ports:
-      - 127.0.0.1:4569:4579 # ses # needed for local integration tests
       - 127.0.0.1:4575:4575 # sns
     environment:
-      - DEBUG=1
-      - DEFAULT_REGION=eu-west-1
-      - SERVICES=ses,sns
+      - MOTO_PORT=4575
+    networks:
+      - demo_wire
+
+  fake_ses:
+    container_name: demo_wire_ses
+    image: motoserver/moto:5.1.22
+    ports:
+      - 127.0.0.1:4569:4579 # ses # needed for local integration tests
+    environment:
+      - MOTO_PORT=4579
     networks:
       - demo_wire
 
@@ -349,17 +355,18 @@ services:
 
   # FIXME: replace aws_cli with an image that we build.
   aws_cli:
-    image: mesosphere/aws-cli:1.14.5
+    image: amazon/aws-cli:2.34.7
     depends_on:
       - fake_dynamodb
       - fake_sqs
-      - fake_localstack
+      - fake_sns
+      - fake_ses
       - fake_s3
     links:
       - fake_dynamodb:dynamodb
       - fake_sqs:sqs
-      - fake_localstack:ses
-      - fake_localstack:sns
+      - fake_ses:ses
+      - fake_sns:sns
       - fake_s3:s3
     entrypoint: /scripts/init.sh
     volumes:
diff --git a/deploy/dockerephemeral/federation-v0/gundeck.yaml b/deploy/dockerephemeral/federation-v0/gundeck.yaml
index 528fc38c1d9..1e6bb7d7014 100644
--- a/deploy/dockerephemeral/federation-v0/gundeck.yaml
+++ b/deploy/dockerephemeral/federation-v0/gundeck.yaml
@@ -26,7 +26,7 @@ redis:
 aws:
   queueName: integration-gundeck-events-federation-v0
   region: eu-west-1
-  account: "123456789012" # Default account nr used by localstack
+  account: "123456789012" # Default account number used by local AWS emulators
   arnEnv: integration
   sqsEndpoint: http://demo_wire_sqs:4568 # https://sqs.eu-west-1.amazonaws.com
   snsEndpoint: http://demo_wire_sns:4575 # https://sns.eu-west-1.amazonaws.com
diff --git a/deploy/dockerephemeral/federation-v1/gundeck.yaml b/deploy/dockerephemeral/federation-v1/gundeck.yaml
index 6722f2e0b90..b362a8629a6 100644
--- a/deploy/dockerephemeral/federation-v1/gundeck.yaml
+++ b/deploy/dockerephemeral/federation-v1/gundeck.yaml
@@ -26,7 +26,7 @@ redis:
 aws:
   queueName: integration-gundeck-events-federation-v1
   region: eu-west-1
-  account: "123456789012" # Default account nr used by localstack
+  account: "123456789012" # Default account number used by local AWS emulators
   arnEnv: integration
   sqsEndpoint: http://demo_wire_sqs:4568 # https://sqs.eu-west-1.amazonaws.com
   snsEndpoint: http://demo_wire_sns:4575 # https://sns.eu-west-1.amazonaws.com
diff --git a/deploy/dockerephemeral/federation-v2/gundeck.yaml b/deploy/dockerephemeral/federation-v2/gundeck.yaml
index 51be1566f2a..514fc40ee62 100644
--- a/deploy/dockerephemeral/federation-v2/gundeck.yaml
+++ b/deploy/dockerephemeral/federation-v2/gundeck.yaml
@@ -29,7 +29,7 @@ redis:
 aws:
   queueName: integration-gundeck-events-federation-v2
   region: eu-west-1
-  account: "123456789012" # Default account nr used by localstack
+  account: "123456789012" # Default account number used by local AWS emulators
   arnEnv: integration
   sqsEndpoint: http://demo_wire_sqs:4568 # https://sqs.eu-west-1.amazonaws.com
   snsEndpoint: http://demo_wire_sns:4575 # https://sns.eu-west-1.amazonaws.com