diff --git a/tasks/heat_domain_setup.yml b/tasks/heat_domain_setup.yml
index 3b9f3e0..8bd0ca9 100644
--- a/tasks/heat_domain_setup.yml
+++ b/tasks/heat_domain_setup.yml
@@ -23,6 +23,7 @@
     login_project_name: "{{ keystone_admin_tenant_name }}"
     endpoint: "{{ keystone_service_adminurl }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
+  no_log: True
 
 - name: Ensure heat domain
   keystone:
@@ -33,6 +34,7 @@
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
+  no_log: True
 
 - name: Ensure heat project
   keystone:
@@ -44,6 +46,7 @@
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
+  no_log: True
 
 - name: Ensure heat user
   keystone:
@@ -60,6 +63,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
 
 - name: Ensure heat role
   keystone:
@@ -76,3 +80,4 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
diff --git a/tasks/heat_service_add.yml b/tasks/heat_service_add.yml
index 38bc314..bb829ef 100644
--- a/tasks/heat_service_add.yml
+++ b/tasks/heat_service_add.yml
@@ -29,6 +29,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
 
 # Create an admin user
 - name: Ensure heat user
@@ -47,6 +48,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
 
 # Add a role to the user
 - name: Ensure heat user to admin role
@@ -65,6 +67,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
 
 # Create an endpoint
 - name: Ensure heat endpoint
@@ -89,3 +92,4 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
diff --git a/tasks/heat_service_setup.yml b/tasks/heat_service_setup.yml
index 6f6052d..ebdb4c2 100644
--- a/tasks/heat_service_setup.yml
+++ b/tasks/heat_service_setup.yml
@@ -48,6 +48,7 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True
 
 # Any user creating stacks needs to have the 'heat_stack_owner' role assigned,
 # we add to admin user here for testing purposes
@@ -66,3 +67,4 @@
   until: add_service|success
   retries: 5
   delay: 10
+  no_log: True