diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 9201f56ecddd95f6cd28db7d858f60a0235a5233..18154cb3458129c2eb84d22e94a34969587bd5fc 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -54,9 +54,8 @@
   when: docker_package_info.pkgs|length > 0
 
 - name: allow for proxies on RHEL systems
-  include: rhel-proxies.yml
-  when: ansible_distribution in ["CentOS","RedHat"] and
-        ansible_distribution_major_version >= 7 and
+  include: systemd-proxies.yml
+  when: ansible_service_mgr == "systemd" and
         (http_proxy is defined or https_proxy is defined or no_proxy is defined)
 
 - meta: flush_handlers
diff --git a/roles/docker/tasks/rhel-proxies.yml b/roles/docker/tasks/systemd-proxies.yml
similarity index 100%
rename from roles/docker/tasks/rhel-proxies.yml
rename to roles/docker/tasks/systemd-proxies.yml