diff --git a/tasks/commit_etc_git.yml b/tasks/commit_etc_git.yml
index 2ccd620..61a1c59 100644
--- a/tasks/commit_etc_git.yml
+++ b/tasks/commit_etc_git.yml
@@ -5,7 +5,9 @@
     chdir: /etc
   changed_when: False
   register: git_status
-  when: not ansible_check_mode
+  # Use this with Ansible 2.1+
+  #when: not ansible_check_mod
+  always_run: yes
   tags:
   - git
 
@@ -14,6 +16,8 @@
   args:
     chdir: /etc
   register: etc_commit_end_evolinux
-  when: not ansible_check_mode and git_status.stdout != ""
+  # Use this with Ansible 2.1+
+  #when: not ansible_check_mode and git_status.stdout != ""
+  when: git_status.stdout != ""
   tags:
   - git