diff --git a/handlers/main.yml b/handlers/main.yml
index 39b308f..e9f4806 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -19,7 +19,7 @@
   systemd:
     daemon_reload: yes
   become: true
-  when: ansible_service_mgr == 'systemd'
+  when: ansible_facts['service_mgr'] == 'systemd'
 
 - name: Docker | reload docker
   service:
diff --git a/tasks/docker-update.yml b/tasks/docker-update.yml
index a932788..643a411 100644
--- a/tasks/docker-update.yml
+++ b/tasks/docker-update.yml
@@ -8,13 +8,13 @@
       set_fact:
         registry_pkg_manager: yum
       when:
-        - ansible_os_family == 'RedHat'
-        - ansible_distribution_major_version|int == 7
+        - ansible_facts['os_family'] == 'RedHat'
+        - ansible_facts['distribution_major_version']|int == 7
 
     - name: set package manager to dnf
       set_fact:
         registry_pkg_manager: dnf
-      when: (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int > 7) or (ansible_distribution == 'Fedora')
+      when: (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version']|int > 7) or (ansible_facts['distribution'] == 'Fedora')
 
 
     - name: can docker be updated
diff --git a/tasks/docker.yml b/tasks/docker.yml
index 6c7e6fd..5d8bb33 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -59,7 +59,7 @@
         path: /etc/systemd/system/docker.service.d
         state: directory
         mode: '0755'
-      when: ansible_service_mgr == 'systemd'
+      when: ansible_facts['service_mgr'] == 'systemd'
 
     - name: unset mountflags
       ini_file:
@@ -70,7 +70,7 @@
         create: yes
         mode: '0644'
       register: _cfg_flags
-      when: ansible_service_mgr == 'systemd'
+      when: ansible_facts['service_mgr'] == 'systemd'
 
     - name: configure OPTIONS in /etc/sysconfig/docker
       lineinfile:
@@ -163,7 +163,7 @@
             daemon_reload: yes
           become: true
           when:
-            - ansible_service_mgr == 'systemd'
+            - ansible_facts['service_mgr'] == 'systemd'
             - _cfg_flags is changed
 
         - name: Reload docker
diff --git a/tasks/install-engine.yml b/tasks/install-engine.yml
index 791a37a..a9af516 100644
--- a/tasks/install-engine.yml
+++ b/tasks/install-engine.yml
@@ -1,8 +1,8 @@
 ---
 - name: Install and Start Docker
   when:
-    - ansible_distribution == "CentOS"
-    - ansible_distribution_major_version|int < 8
+    - ansible_facts['distribution'] == "CentOS"
+    - ansible_facts['distribution_major_version']|int < 8
   become: true
   block: