diff --git a/README.md b/README.md
index 1539d6780..38ec5748c 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ This playbook sets up your server using the following Docker images:
 
 - [postgres](https://hub.docker.com/_/postgres/) - the [Postgres](https://www.postgresql.org/) database server (optional)
 
-- [cloudproto/goofys](https://hub.docker.com/r/cloudproto/goofys/) - the [Goofys](https://github.com/kahing/goofys) Amazon [S3](https://aws.amazon.com/s3/) file-system-mounting program (optional)
+- [ewoutp/goofys](https://hub.docker.com/r/ewoutp/goofys/) - the [Goofys](https://github.com/kahing/goofys) Amazon [S3](https://aws.amazon.com/s3/) file-system-mounting program (optional)
 
 - [panubo/postfix](https://hub.docker.com/r/panubo/postfix/) - the [Postfix](http://www.postfix.org/) email server (optional)
 
diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 82d0d0230..39814bc98 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -198,7 +198,7 @@ matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
 
 
 matrix_s3_media_store_enabled: false
-matrix_s3_goofys_docker_image: "cloudproto/goofys:latest"
+matrix_s3_goofys_docker_image: "ewoutp/goofys:latest"
 matrix_s3_media_store_bucket_name: "your-bucket-name"
 matrix_s3_media_store_aws_access_key: "your-aws-access-key"
 matrix_s3_media_store_aws_secret_key: "your-aws-secret-key"