diff --git a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2
index 33d5c899ee5..19527310a59 100644
--- a/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2
+++ b/lib/ansible/galaxy/data/apb/playbooks/deprovision.yml.j2
@@ -1,8 +1,8 @@
-- name: {{ role_name }} playbook to deprovision the application
+- name: "{{ role_name }} playbook to deprovision the application"
   hosts: localhost
   gather_facts: false
   connection: local
   vars:
     apb_action: deprovision
   roles:
-  - role: {{ role_name }}
+    - role: {{ role_name }}
diff --git a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2 b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2
index e3379f27592..7b08605ec58 100644
--- a/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2
+++ b/lib/ansible/galaxy/data/apb/playbooks/provision.yml.j2
@@ -1,8 +1,8 @@
-- name: {{ role_name }} playbook to provision the application
+- name: "{{ role_name }} playbook to provision the application"
   hosts: localhost
   gather_facts: false
   connection: local
   vars:
     apb_action: provision
   roles:
-  - role: {{ role_name }}
+    - role: {{ role_name }}
diff --git a/lib/ansible/galaxy/data/apb/tests/test.yml.j2 b/lib/ansible/galaxy/data/apb/tests/test.yml.j2
index 224ea3113e2..fb14f85c97b 100644
--- a/lib/ansible/galaxy/data/apb/tests/test.yml.j2
+++ b/lib/ansible/galaxy/data/apb/tests/test.yml.j2
@@ -5,4 +5,3 @@
   tasks:
 
   # Add tasks and assertions for testing the service here.
-
diff --git a/lib/ansible/galaxy/data/apb/vars/main.yml.j2 b/lib/ansible/galaxy/data/apb/vars/main.yml.j2
index b0524ec32aa..092d511a1e6 100644
--- a/lib/ansible/galaxy/data/apb/vars/main.yml.j2
+++ b/lib/ansible/galaxy/data/apb/vars/main.yml.j2
@@ -1,3 +1,2 @@
 ---
 # vars file for {{ role_name }}
-
diff --git a/lib/ansible/galaxy/data/container/defaults/main.yml.j2 b/lib/ansible/galaxy/data/container/defaults/main.yml.j2
index 3da8d52cc1d..3818e64c335 100644
--- a/lib/ansible/galaxy/data/container/defaults/main.yml.j2
+++ b/lib/ansible/galaxy/data/container/defaults/main.yml.j2
@@ -1,3 +1,2 @@
 ---
 # defaults file for {{ role_name }}
-
diff --git a/lib/ansible/galaxy/data/container/tasks/main.yml.j2 b/lib/ansible/galaxy/data/container/tasks/main.yml.j2
index 115d841bdae..a9880650590 100644
--- a/lib/ansible/galaxy/data/container/tasks/main.yml.j2
+++ b/lib/ansible/galaxy/data/container/tasks/main.yml.j2
@@ -1,3 +1,2 @@
 ---
 # tasks file for {{ role_name }}
-
diff --git a/lib/ansible/galaxy/data/container/tests/test.yml.j2 b/lib/ansible/galaxy/data/container/tests/test.yml.j2
index 224ea3113e2..fb14f85c97b 100644
--- a/lib/ansible/galaxy/data/container/tests/test.yml.j2
+++ b/lib/ansible/galaxy/data/container/tests/test.yml.j2
@@ -5,4 +5,3 @@
   tasks:
 
   # Add tasks and assertions for testing the service here.
-
diff --git a/lib/ansible/galaxy/data/container/vars/main.yml.j2 b/lib/ansible/galaxy/data/container/vars/main.yml.j2
index b0524ec32aa..092d511a1e6 100644
--- a/lib/ansible/galaxy/data/container/vars/main.yml.j2
+++ b/lib/ansible/galaxy/data/container/vars/main.yml.j2
@@ -1,3 +1,2 @@
 ---
 # vars file for {{ role_name }}
-
diff --git a/lib/ansible/galaxy/data/default/meta/main.yml.j2 b/lib/ansible/galaxy/data/default/meta/main.yml.j2
index f8fb848398c..262b85307f0 100644
--- a/lib/ansible/galaxy/data/default/meta/main.yml.j2
+++ b/lib/ansible/galaxy/data/default/meta/main.yml.j2
@@ -58,6 +58,6 @@ galaxy_info:
 dependencies: []
   # List your role dependencies here, one per line. Be sure to remove the '[]' above,
   # if you add dependencies to this list.
-  {%- for dependency in dependencies %}
+  {% for dependency in dependencies %}
   #- {{ dependency }}
   {%- endfor %}
diff --git a/lib/ansible/galaxy/data/default/tests/test.yml.j2 b/lib/ansible/galaxy/data/default/tests/test.yml.j2
index 45824f60519..0c40f95a697 100644
--- a/lib/ansible/galaxy/data/default/tests/test.yml.j2
+++ b/lib/ansible/galaxy/data/default/tests/test.yml.j2
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - {{ role_name }}
\ No newline at end of file
+    - {{ role_name }}