diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 7fb62f0..12731d8 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -64,7 +64,7 @@
 
 - name: Restart redis-server
   vars:
-    _daemon: "{{ 'redis' if ansible_distribution == 'CentOS' else 'redis-server' }}"
+    _daemon: "{{ 'redis' if ansible_facts['distribution'] == 'CentOS' else 'redis-server' }}"
   service:
     name: "{{ _daemon }}"
     state: restarted
diff --git a/roles/common/tasks/redis-server.yml b/roles/common/tasks/redis-server.yml
index 71fc45e..e460584 100644
--- a/roles/common/tasks/redis-server.yml
+++ b/roles/common/tasks/redis-server.yml
@@ -3,7 +3,7 @@
 
 - name: (redis-server.yml) Set var '_redis_conf'
   set_fact:
-     _redis_conf: "{{ '/etc/redis.conf' if ansible_distribution == 'CentOS' else '/etc/redis/redis.conf' }}"
+     _redis_conf: "{{ '/etc/redis.conf' if ansible_facts['distribution'] == 'CentOS' else '/etc/redis/redis.conf' }}"
 
 - name: (redis-server.yml) update
   apt:
@@ -54,7 +54,7 @@
     state: latest
     update_cache: yes
   when:
-    - ansible_os_family == "RedHat"
+    - ansible_facts["os_family"] == "RedHat"
     - ansible_distribution == "CentOS" or ansible_distribution == "Fedora"
   tags:
     - redis-server