diff --git a/roles/collect-logs/library/ara_influxdb.py b/roles/collect-logs/library/ara_influxdb.py
index 940f28e7b..747a9f234 100644
--- a/roles/collect-logs/library/ara_influxdb.py
+++ b/roles/collect-logs/library/ara_influxdb.py
@@ -480,7 +480,8 @@ def main():
             influxdb_url=dict(required=True, type='str'),
             influxdb_port=dict(required=True, type='int'),
             influxdb_user=dict(required=False, type='str', default=None),
-            influxdb_password=dict(required=False, type='str', default=None),
+            influxdb_password=dict(required=False, type='str',
+                                   default=None, no_log=True),
             influxdb_db=dict(required=True, type='str'),
             ara_data=dict(required=True, type='str'),
             measurement=dict(required=True, type='str'),
diff --git a/roles/tripleo-validations/tasks/main.yml b/roles/tripleo-validations/tasks/main.yml
index 25d995837..05a2da7d0 100644
--- a/roles/tripleo-validations/tasks/main.yml
+++ b/roles/tripleo-validations/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 
-- when: release not in ['mitaka', 'liberty']
+- name: tripleo-validation block
+  when: release not in ['mitaka', 'liberty']
   block:
     - name: Installing configuration requirements
-      include: config.yml
-      static: no
+      include_tasks: config.yml
       tags:
         - tripleo-validations
       when: run_tripleo_validations_setup|bool
diff --git a/roles/undercloud-deploy/tasks/create-scripts.yml b/roles/undercloud-deploy/tasks/create-scripts.yml
index 50b557911..1eb141a86 100644
--- a/roles/undercloud-deploy/tasks/create-scripts.yml
+++ b/roles/undercloud-deploy/tasks/create-scripts.yml
@@ -91,7 +91,6 @@
      - undercloud_templates_branch is defined or undercloud_templates_refspec is defined
      - undercloud_templates_repo is defined
      - undercloud_templates_path is defined
-  static: no
 
 - name: Create the undercloud parameter defaults file.
   template: