diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index db5c16b76a..3871717e54 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -38,9 +38,16 @@
   - service
   - openvpn
 
-- name: enable openvpn service for rhel 7 or Fedora
+- name: enable openvpn service for rhel 7
   service: name=openvpn@openvpn state=running enabled=true
-  when: ansible_distribution_version[0] == 7 or is_fedora is defined
+  when: ansible_distribution_version[0] == 7
+  tags:
+  - service
+  - openvpn
+
+- name: enable openvpn service for Fedora
+  service: name=openvpn@openvpn state=running enabled=true
+  when: is_fedora is defined
   tags:
   - service
   - openvpn