diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 37d2863..3b87e5a 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -160,14 +160,14 @@
 
 # CREATE USER mastodon CREATEDB;
 - name: Set up database
-  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm shell bundle exec rake db:setup && echo 'Database ready' > /var/lib/mastodon_db_setup"
+  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm web bundle exec rake db:setup && echo 'Database ready' > /var/lib/mastodon_db_setup"
   args:
     creates: /var/lib/mastodon_db_setup
     chdir: "{{ mastodon_composer_folder }}"
   when: mastodon_initial_setup
 
 - name: Migrate database
-  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm shell bundle exec rake db:migrate && echo 'Database migrated' > /var/lib/mastodon_db_migrated"
+  shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm web bundle exec rake db:migrate && echo 'Database migrated' > /var/lib/mastodon_db_migrated"
   args:
     creates: /var/lib/mastodon_db_migrated
     chdir: "{{ mastodon_composer_folder }}"
@@ -182,7 +182,7 @@
     build: true
 
 - name: Create initial user
-  shell: "docker-compose -f /opt/mastodon/docker-compose.yml run --rm shell bin/tootctl accounts create '{{ mastodon_owner }}' --email '{{ mastodon_owner_email }}' --confirmed --role Owner && echo 'Owner account created' > /var/lib/mastodon_owner_created"
+  shell: "docker-compose -f /opt/mastodon/docker-compose.yml run --rm web bin/tootctl accounts create '{{ mastodon_owner }}' --email '{{ mastodon_owner_email }}' --confirmed --role Owner && echo 'Owner account created' > /var/lib/mastodon_owner_created"
   args:
     creates: /var/lib/mastodon_owner_created
     chdir: "{{ mastodon_composer_folder }}"