diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 60bf354..8fd7fc7 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -32,31 +32,7 @@
     project_src: "{{ mastodon_composer_folder }}/"
     build: true
     state: present
-
-- name: Stop mastodon_web_1 container
-  docker_container:
-    name: mastodon_web_1
-    state: stopped
-
-- name: Stop mastodon_streaming_1 container
-  docker_container:
-    name: mastodon_streaming_1
-    state: stopped
-
-- name: Stop mastodon_sidekiq_1 container
-  docker_container:
-    name: mastodon_sidekiq_1
-    state: stopped
-
-- name: Stop mastodon_redis_1 container
-  docker_container:
-    name: mastodon_redis_1
-    state: stopped
-
-- name: Stop mastodon_db_1 container
-  docker_container:
-    name: mastodon_db_1
-    state: stopped
+    stopped: true
 
 - name: Generate secret key
   shell: docker-compose run --rm web bundle exec rake secret
@@ -151,33 +127,9 @@
     project_name: mastodon
     project_src: "{{ mastodon_composer_folder }}/"
     state: present
+    stopped: true
     build: true
 
-- name: Stop mastodon_web_1 container
-  docker_container:
-    name: mastodon_web_1
-    state: stopped
-
-- name: Stop mastodon_streaming_1 container
-  docker_container:
-    name: mastodon_streaming_1
-    state: stopped
-
-- name: Stop mastodon_sidekiq_1 container
-  docker_container:
-    name: mastodon_sidekiq_1
-    state: stopped
-
-- name: Stop mastodon_redis_1 container
-  docker_container:
-    name: mastodon_redis_1
-    state: stopped
-
-- name: Stop mastodon_db_1 container
-  docker_container:
-    name: mastodon_db_1
-    state: stopped
-
 - name: Set up database
   shell: docker-compose run --rm web rails db:migrate && echo "Database set up." > /var/lib/mastodon_db_setup
   args: