diff --git a/docs/configuring-playbook.md b/docs/configuring-playbook.md
index 326ba720c..3524a02f1 100644
--- a/docs/configuring-playbook.md
+++ b/docs/configuring-playbook.md
@@ -56,7 +56,9 @@ When you're done with all the configuration you'd like to do, continue with [Ins
 
 - [Storing Matrix media files using matrix-media-repo](configuring-playbook-matrix-media-repo.md) (optional)
 
-- [Storing Matrix media files on Amazon S3](configuring-playbook-s3.md) (optional)
+- [Storing Synapse media files on Amazon S3 or another compatible Object Storage](configuring-playbook-s3.md) (optional)
+
+- [Storing Matrix media files on Amazon S3 with Goofys](docs/configuring-playbook-s3-goofys.md) (optional)
 
 - [Using an external PostgreSQL server](configuring-playbook-external-postgres.md) (optional)
 
diff --git a/docs/importing-synapse-media-store.md b/docs/importing-synapse-media-store.md
index 97d89c4e9..01180edab 100644
--- a/docs/importing-synapse-media-store.md
+++ b/docs/importing-synapse-media-store.md
@@ -7,7 +7,7 @@ Run this if you'd like to import your `media_store` files from a previous instal
 
 Before doing the actual data restore, **you need to upload your media store directory to the server** (any path is okay).
 
-If you are [Storing Matrix media files on Amazon S3](configuring-playbook-s3.md) (optional), restoring with this tool is not possible right now.
+If you are [storing Matrix media files on Amazon S3](configuring-playbook-s3.md) (optional), restoring with this tool is not possible right now.
 
 As an alternative, you can perform a manual restore using the [AWS CLI tool](https://aws.amazon.com/cli/) (e.g. `aws s3 sync /path/to/server/media_store/. s3://name-of-bucket/`)