diff --git a/tasks/rsync-deploy.yml b/tasks/rsync-deploy.yml
index 2704017..fec70d6 100644
--- a/tasks/rsync-deploy.yml
+++ b/tasks/rsync-deploy.yml
@@ -19,16 +19,22 @@
     path: "{{ ansistrano_deploy_to }}/{{ ansistrano_current_dir }}"
 
 - name: ANSISTRANO | Sync release to new current path
-  command: rsync -a -F --no-times --delete-after "{{ ansistrano_release_path.stdout }}/" "{{ ansistrano_deploy_to }}/{{ ansistrano_current_dir }}/"
+  command:
+    argv:
+      - rsync
+      - -a
+      - -F
+      - --no-times
+      - --delete-after
+      - "{{ ansistrano_release_path.stdout }}/"
+      - "{{ ansistrano_deploy_to }}/{{ ansistrano_current_dir }}/"
 
 # Ensure symlinks target paths is absent
 - name: ANSISTRANO | Ensure shared paths targets are absent
   file:
     state: absent
     path: "{{ ansistrano_deploy_to }}/{{ ansistrano_current_dir }}/{{ item }}"
-  with_flattened:
-    - "{{ ansistrano_shared_paths }}"
-    - "{{ ansistrano_shared_files }}"
+  loop: "{{ ansistrano_shared_paths + ansistrano_shared_files }}"
 
 # Symlinks shared paths
 - name: ANSISTRANO | Create softlinks for shared paths
@@ -36,6 +42,4 @@
     state: link
     path: "{{ ansistrano_deploy_to }}/{{ ansistrano_current_dir }}/{{ item }}"
     src: "{{ item | regex_replace('[^\\/]+', '..') }}/{{ ansistrano_shared_dir }}/{{ item }}"
-  with_flattened:
-    - "{{ ansistrano_shared_paths }}"
-    - "{{ ansistrano_shared_files }}"
+  loop: "{{ ansistrano_shared_paths + ansistrano_shared_files }}"
diff --git a/tasks/setup.yml b/tasks/setup.yml
index ca8bf07..9a4941d 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -20,13 +20,13 @@
   file:
     state: directory
     path: "{{ ansistrano_shared_path }}/{{ item }}"
-  with_items: "{{ ansistrano_shared_paths }}"
-  when: ansistrano_ensure_shared_paths_exist|bool
+  loop: "{{ ansistrano_shared_paths }}"
+  when: ansistrano_ensure_shared_paths_exist | bool
 
 # Ensure basedir shared files exists
 - name: ANSISTRANO | Ensure basedir shared files exists
   file:
     state: directory
     path: "{{ ansistrano_shared_path }}/{{ item | dirname }}"
-  with_items: "{{ ansistrano_shared_files }}"
-  when: ansistrano_ensure_basedirs_shared_files_exist|bool
+  loop: "{{ ansistrano_shared_files }}"
+  when: ansistrano_ensure_basedirs_shared_files_exist | bool
diff --git a/tasks/update-code.yml b/tasks/update-code.yml
index a78c58e..f628f44 100644
--- a/tasks/update-code.yml
+++ b/tasks/update-code.yml
@@ -18,10 +18,13 @@
   copy:
     content: "{{ ansistrano_release_version }}"
     dest: "{{ ansistrano_release_path.stdout }}/REVISION"
-  when: ansistrano_git_result is not defined or ansistrano_git_result is none
+  when:
+    - ansistrano_git_result is not defined or ansistrano_git_result is none
 
 - name: ANSISTRANO | Copy git released version into REVISION file
   copy:
     content: "{{ ansistrano_git_result.after | default(ansistrano_release_version) }}"
     dest: "{{ ansistrano_release_path.stdout }}/REVISION"
-  when: ansistrano_git_result is defined and ansistrano_git_result is not none
+  when:
+    - ansistrano_git_result is defined
+    - ansistrano_git_result is not none
diff --git a/tasks/update-code/download.yml b/tasks/update-code/download.yml
index 746ee11..bc050cb 100644
--- a/tasks/update-code/download.yml
+++ b/tasks/update-code/download.yml
@@ -4,7 +4,6 @@
     state: directory
     path: "{{ ansistrano_release_path.stdout }}"
 
-# We should be able to remove default(omit) filters and add defaults once we deprecate Ansible 1.9
 - name: ANSISTRANO | download | Download artifact
   get_url:
     url: "{{ ansistrano_get_url }}"
diff --git a/tasks/update-code/hg.yml b/tasks/update-code/hg.yml
index 9171a31..bb86903 100644
--- a/tasks/update-code/hg.yml
+++ b/tasks/update-code/hg.yml
@@ -13,6 +13,12 @@
     path: "{{ ansistrano_release_path.stdout }}"
 
 - name: ANSISTRANO | HG | Sync repo to release path
-  command: "hg archive -r {{ ansistrano_hg_branch }} {{ ansistrano_release_path.stdout }}"
+  command:
+    argv:
+      - hg
+      - archive
+      - -r
+      - "{{ ansistrano_hg_branch }}"
+      - "{{ ansistrano_release_path.stdout }}"
   args:
     chdir: "{{ ansistrano_deploy_to }}/{{ ansistrano_repo_dir }}/"
diff --git a/tasks/update-code/rsync.yml b/tasks/update-code/rsync.yml
index a3b29ae..014f2ec 100644
--- a/tasks/update-code/rsync.yml
+++ b/tasks/update-code/rsync.yml
@@ -18,4 +18,9 @@
     rsync_path: "{{ ansistrano_rsync_path | default(omit) }}"
 
 - name: ANSISTRANO | RSYNC | Deploy existing code to servers
-  command: cp -a {{ ansistrano_shared_rsync_copy_path.stdout }} {{ ansistrano_release_path.stdout }}
+  command:
+    argv:
+      - cp
+      - -a
+      - "{{ ansistrano_shared_rsync_copy_path.stdout }}"
+      - "{{ ansistrano_release_path.stdout }}"
diff --git a/tasks/update-code/svn.yml b/tasks/update-code/svn.yml
index 6b695cc..65b1b70 100644
--- a/tasks/update-code/svn.yml
+++ b/tasks/update-code/svn.yml
@@ -11,7 +11,8 @@
   register: ansistrano_svn_result_update
 
 - name: ANSISTRANO | SVN | Register ansistrano_svn_result variable
-  set_fact: ansistrano_svn_result={{ ansistrano_svn_result_update }}
+  set_fact:
+    ansistrano_svn_result: "{{ ansistrano_svn_result_update }}"
 
 - name: ANSISTRANO | SVN | Create release folder
   file: