diff --git a/roles/docker_s3_backup/tasks/main.yml b/roles/docker_s3_backup/tasks/main.yml
index 68372e7..58cfce1 100644
--- a/roles/docker_s3_backup/tasks/main.yml
+++ b/roles/docker_s3_backup/tasks/main.yml
@@ -29,7 +29,7 @@
     name: "backup-container-{{ item.Name }}-{{ 10 | random }}"
     image: ubuntu
     command: "tar -czvf /backups/{{ item.Name }}-{{ backup_time }}.tar.gz /data"
-    auto_remove: true
+    cleanup: true
     detach: false # block until this container exists.
     state: started
     volumes:
diff --git a/roles/docker_s3_volume_restore/tasks/main.yml b/roles/docker_s3_volume_restore/tasks/main.yml
index bc36bfd..0ca269b 100644
--- a/roles/docker_s3_volume_restore/tasks/main.yml
+++ b/roles/docker_s3_volume_restore/tasks/main.yml
@@ -73,7 +73,7 @@
     name: "restore-container-{{ docker_backup_s3_volume.name }}-{{ 100 | random }}"
     image: ubuntu
     command: "rm -rf ./*"
-    auto_remove: true
+    cleanup: true
     detach: false # block until this container exists.
     state: started
     # start inside the directory we want to wipe
@@ -90,7 +90,7 @@
     image: ubuntu
     # extract the tar into the volume.
     command: "tar xvf /tmp/{{ container_s3_key }} -C /data --strip-components 1"
-    auto_remove: true
+    cleanup: true
     detach: false # block until this container exists.
     state: started
     volumes: