diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt
index bb25377d75..2e464749ec 100644
--- a/services/filestore/buildscript.txt
+++ b/services/filestore/buildscript.txt
@@ -6,4 +6,4 @@ filestore
 --env-pass-through=
 --node-version=12.18.4
 --public-repo=True
---script-version=3.3.4
+--script-version=3.4.0
diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml
index a53beb7636..bb16114cf9 100644
--- a/services/filestore/docker-compose.ci.yml
+++ b/services/filestore/docker-compose.ci.yml
@@ -20,6 +20,7 @@ services:
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
+      QUEUES_REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
       AWS_S3_ENDPOINT: http://s3:9090
@@ -58,12 +59,17 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   s3:
-    build:
-      context: test/acceptance/deps
-      dockerfile: Dockerfile.s3mock
+    image: adobe/s3mock
     environment:
       - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket
+    healthcheck:
+      test: wget --quiet --output-document=/dev/null http://localhost:9090
+      interval: 1s
+      retries: 20
   gcs:
-    build:
-      context: test/acceptance/deps
-      dockerfile: Dockerfile.fake-gcs
+    image: fsouza/fake-gcs-server
+    command: ["--port=9090", "--scheme=http"]
+    healthcheck:
+      test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
+      interval: 1s
+      retries: 20
diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml
index 1b21354b52..6ad3ceb2a8 100644
--- a/services/filestore/docker-compose.yml
+++ b/services/filestore/docker-compose.yml
@@ -29,6 +29,7 @@ services:
     environment:
       ELASTIC_SEARCH_DSN: es:9200
       REDIS_HOST: redis
+      QUEUES_REDIS_HOST: redis
       MONGO_HOST: mongo
       POSTGRES_HOST: postgres
       AWS_S3_ENDPOINT: http://s3:9090
@@ -60,12 +61,17 @@ services:
     command: npm run --silent test:acceptance
 
   s3:
-    build:
-      context: test/acceptance/deps
-      dockerfile: Dockerfile.s3mock
+    image: adobe/s3mock
     environment:
       - initialBuckets=fake_user_files,fake_template_files,fake_public_files,bucket
+    healthcheck:
+      test: wget --quiet --output-document=/dev/null http://localhost:9090
+      interval: 1s
+      retries: 20
   gcs:
-    build:
-      context: test/acceptance/deps
-      dockerfile: Dockerfile.fake-gcs
+    image: fsouza/fake-gcs-server
+    command: ["--port=9090", "--scheme=http"]
+    healthcheck:
+      test: wget --quiet --output-document=/dev/null http://localhost:9090/storage/v1/b
+      interval: 1s
+      retries: 20