diff --git a/ansible/roles/aodh/tasks/stop.yml b/ansible/roles/aodh/tasks/stop.yml
new file mode 100644
index 0000000000..eca45ee0fe
--- /dev/null
+++ b/ansible/roles/aodh/tasks/stop.yml
@@ -0,0 +1,6 @@
+---
+- import_role:
+    name: service-stop
+  vars:
+    project_services: "{{ aodh_services }}"
+    service_name: "{{ project_name }}"
diff --git a/ansible/roles/swift/tasks/deploy-containers.yml b/ansible/roles/swift/tasks/deploy-containers.yml
new file mode 100644
index 0000000000..1ccb8b1e65
--- /dev/null
+++ b/ansible/roles/swift/tasks/deploy-containers.yml
@@ -0,0 +1,2 @@
+---
+- import_tasks: start.yml