diff --git a/defaults/main.yml b/defaults/main.yml
index dc683d8..669f9e0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -59,7 +59,7 @@ redis_port: 6379
 db_host: /var/run/postgresql
 self_signed_cert_location: /etc/ssl/certs
 self_signed_key_location: /etc/ssl/private
-mastodon_composer_folder: /etc/mastodon_docker_compose
+mastodon_composer_folder: /usr/src/mastodon
 
 es_enabled: 'false'
 es_host: localhost
diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 145768e..fb42853 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -2,12 +2,11 @@
 - name: Clone Mastodon repo
   git:
     repo: https://github.com/mastodon/mastodon.git
-    dest: /usr/src/mastodon
+    dest: "{{ mastodon_composer_folder }}"
     depth: 1
 
 - name: Copy Dockerfile from Mastodon repo
   copy:
-#    remote_src: true
     src: files/Dockerfile
     dest: "{{ mastodon_composer_folder }}/Dockerfile"