diff --git a/roles/fedoraloveskde/build/tasks/main.yml b/roles/fedoraloveskde/build/tasks/main.yml
index aa7c2539b3..cfe560059c 100644
--- a/roles/fedoraloveskde/build/tasks/main.yml
+++ b/roles/fedoraloveskde/build/tasks/main.yml
@@ -1,8 +1,12 @@
 - name: Create directories
-  file: state=directory
-        path=/srv/web/{{item}}
-        owner=apache group=apache mode=0755
-        setype=httpd_sys_content_t seuser=system_u
+  file:
+    state: directory
+    path: "/srv/web/{{item}}"
+    owner: apache
+    group: apache
+    mode: 0755
+    setype: httpd_sys_content_t
+    seuser: system_u
   with_items:
   - fedoraloveskde.org
   tags:
@@ -10,24 +14,37 @@
 
 - name: Copy syncfedoraloveskde script (stg)
   when: env == "staging"
-  copy: >
-    src=syncfedoraloveskde.stg.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root
-    mode=0755
+  copy:
+    src: sync{{item}}.stg.sh
+    dest: /usr/local/bin/sync{{item}}
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+  - fedoraloveskde
   tags:
   - fedoraloveskde
 
 - name: Copy syncfedoraloveskde script (prod)
   when: env == "production"
-  copy: >
-    src=syncfedoraloveskde.sh dest=/usr/local/bin/syncfedoraloveskde owner=root group=root
-    mode=0755
+  copy:
+    src: "{{item}}.sh"
+    dest: "/usr/local/bin/{{item}}"
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+  - syncfedoraloveskde
   tags:
   - fedoraloveskde
 
 - name: Install the syncfedoraloveskde cron job
-  copy: >
-    src={{item}}.cron dest=/etc/cron.d/{{item}}.cron
-    owner=root group=root mode=0644
+  copy:
+    src: "{{item}}.cron"
+    dest: "/etc/cron.d/{{item}}.cron"
+    owner: root
+    group: root
+    mode: 0644
   with_items:
   - syncfedoraloveskde
   tags:
diff --git a/roles/fedoraloveskde/website/tasks/main.yml b/roles/fedoraloveskde/website/tasks/main.yml
index 5a1317431d..b23fc76dfb 100644
--- a/roles/fedoraloveskde/website/tasks/main.yml
+++ b/roles/fedoraloveskde/website/tasks/main.yml
@@ -1,12 +1,19 @@
 - name: Copy in the sync-fedoraloveskde cronjob
-  copy: src=cron-sync-fedoraloveskde dest=/etc/cron.d/sync-fedoraloveskde
+  copy:
+    src: "cron-sync-{{item}}"
+    dest: "/etc/cron.d/sync-{{item}}"
+  with_items:
+    - fedoraloveskde
   tags:
   - fedoraloveskde
 
 - name: Copy some config files for {{website}}
-  copy: >
-    src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}}
-    owner=root group=root mode=0644
+  copy:
+    src: "{{item}}"
+    dest: "/etc/httpd/conf.d/{{website}}/{{item}}"
+    owner: root
+    group: root
+    mode: 0644
   with_items:
   - fedoraloveskde.conf
   notify: