diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 29e7cb0d1c..e4c1d6cbed 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -65,16 +65,16 @@
 - name: restart ntpd
   action: service name=ntpd state=restarted
 
-- name: restart openvpn
+- name: restart openvpn (Fedora)
+  when: ansible_distribution == "Fedora"
+  action: service name=openvpn@openvpn state=restarted
+
+- name: restart openvpn (RHEL6)
+  when: ansible_distribution == "Red Hat Enterprise Linux" and ansible_distribution_version[0] == 6
   action: service name=openvpn state=restarted
 
-- name: restart openvpn 2
-  action: service name=openvpn state=restarted
-
-- name: restart openvpn 6
-  action: service name=openvpn state=restarted
-
-- name: restart openvpn 7
+- name: restart openvpn (RHEL7)
+  when: ansible_distribution == "Red Hat Enterprise Linux" and ansible_distribution_version[0] == 7
   action: service name=openvpn@openvpn state=restarted
 
 - name: restart postfix
diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index aa221e8f0b..bd7b90d0ec 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -27,7 +27,9 @@
   - install
   - openvpn
   notify:
-  - "restart openvpn {{ ansible_distribution_version[0] }}"
+  - restart openvpn (Fedora)
+  - restart openvpn (RHEL7)
+  - restart oepnvpn (RHEL6)
 
 - name: enable openvpn service for rhel 6
   service: name=openvpn state=running enabled=true
diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml
index 22e5da6714..aec2b1332d 100644
--- a/roles/openvpn/server/tasks/main.yml
+++ b/roles/openvpn/server/tasks/main.yml
@@ -43,8 +43,9 @@
   - install
   - openvpn
   notify:
-  - "restart openvpn {{ ansible_distribution_version[0] }}"
-
+  - restart openvpn (Fedora)
+  - restart openvpn (RHEL7)
+  - restart oepnvpn (RHEL6)
 
 - name: Install the ccd files
   file: file src={{ files }}/ccd/ dest=/etc/openvpn/ccd/ recurse=true 
@@ -54,16 +55,16 @@
   - openvpn
 
 
-- name: enable openvpn service for rhel 6 or Fedora
+- name: enable openvpn service for rhel 6
   service: name=openvpn state=running enabled=true
-  when: ansible_distribution_version[0] == 6 or is_fedora is defined
+  when: ansible_distribution_version[0] == 6
   tags:
   - service
   - openvpn
 
-- name: enable openvpn service for rhel 7
+- name: enable openvpn service for rhel 7 or Fedora
   service: name=openvpn@openvpn state=running enabled=true
-  when: ansible_distribution_version[0] == 7
+  when: ansible_distribution_version[0] == 7 or is_fedora is defined
   tags:
   - service
   - openvpn