diff --git a/docker-compose.yml b/docker-compose.yml
index 444f0edc15..61e7e3efac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,8 @@ services:
       test: [ "CMD", "curl", "-f", "http://localhost:4566/health" ]
 
   fake-gcs:
-    image: fsouza/fake-gcs-server
+    # Custom image - see fsouza/fake-gcs-server#1164
+    image: tustvold/fake-gcs-server
     command: ["-scheme", "http", "-port", "4443", "-external-url", "http://[::]:4443", "-backend", "memory"]
     ports:
       - 4443:4443