diff --git a/tasks/tempest_post_install.yml b/tasks/tempest_post_install.yml
index 0fe7daf9..13b646e6 100644
--- a/tasks/tempest_post_install.yml
+++ b/tasks/tempest_post_install.yml
@@ -81,29 +81,22 @@
 
 - name: Copy tempest config
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "tempest.conf.j2"
+    dest: "{{ tempest_git_dest }}/etc/tempest.conf"
     owner: "root"
     group: "root"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "tempest.conf.j2"
-      dest: "{{ tempest_git_dest }}/etc/tempest.conf"
-      config_overrides: "{{ tempest_tempest_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ tempest_tempest_conf_overrides }}"
+    config_type: "ini"
   tags:
     - tempest-config
 
 - name: Generate tempest Config
   template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "openstack_tempest_gate.sh.j2"
+    dest: "/opt/openstack_tempest_gate.sh"
     owner: "root"
     group: "root"
-    mode: "{{ item.mode|default('0644') }}"
-  with_items:
-    - { src: openstack_tempest_gate.sh.j2, dest: /opt/openstack_tempest_gate.sh, mode: "0755" }
+    mode: "0755"
   tags:
     - tempest-config