diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index d669077b..1082128a 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -108,7 +108,6 @@ matrix_docker_image_postgres_latest: "{{ matrix_docker_image_postgres_v10 }}"
 matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.3"
 matrix_docker_image_nginx: "nginx:1.15.2-alpine"
 matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.1"
-matrix_docker_image_s3fs: "xueshanf/s3fs:latest"
 matrix_docker_image_goofys: "cloudproto/goofys:latest"
 matrix_docker_image_coturn: "instrumentisto/coturn:4.5.0.7"
 matrix_docker_image_mailer: "panubo/postfix:latest"
diff --git a/roles/matrix-server/tasks/main.yml b/roles/matrix-server/tasks/main.yml
index 726f58fb..a079674f 100644
--- a/roles/matrix-server/tasks/main.yml
+++ b/roles/matrix-server/tasks/main.yml
@@ -22,11 +22,6 @@
     - setup-all
     - setup-postgres
 
-- include: tasks/setup_s3fs.yml
-  tags:
-    - setup-all
-    - setup-s3fs
-
 - include: tasks/setup_goofys.yml
   tags:
     - setup-all
diff --git a/roles/matrix-server/tasks/setup_s3fs.yml b/roles/matrix-server/tasks/setup_s3fs.yml
deleted file mode 100644
index f3120809..00000000
--- a/roles/matrix-server/tasks/setup_s3fs.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Tasks related to getting rid of s3fs (if it was previously installed)
-#
-
-- name: Check existence of matrix-s3fs service
-  stat: path="/etc/systemd/system/matrix-s3fs.service"
-  register: matrix_s3fs_service_stat
-
-- name: Ensure matrix-s3fs is stopped
-  service: name=matrix-s3fs state=stopped daemon_reload=yes
-  register: stopping_result
-  when: "matrix_s3fs_service_stat.stat.exists"
-
-- name: Ensure matrix-s3fs.service doesn't exist
-  file:
-    path: "/etc/systemd/system/matrix-s3fs.service"
-    state: absent
-
-- name: Ensure s3fs-credentials doesn't exist
-  file:
-    path: "{{ matrix_base_data_path }}/s3fs-credentials"
-    state: absent
-
-- name: Ensure S3fs Docker image doesn't exist
-  docker_image:
-    name: "{{ matrix_docker_image_s3fs }}"
-    state: absent