diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index a7c6ae20e5..5a32cb62a1 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -56,7 +56,7 @@
 
 - name: restart openvpn (Fedora)
   when: ansible_distribution == "Fedora"
-  action: service name=openvpn@openvpn state=restarted
+  action: service name=openvpn-client@openvpn state=restarted
   #notify:
   #- fix openvpn routing
 
@@ -68,7 +68,7 @@
 
 - name: restart openvpn (RHEL7)
   when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7
-  action: service name=openvpn@openvpn state=restarted
+  action: service name=openvpn-client@openvpn state=restarted
   #notify:
   #- fix openvpn routing
 
diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml
index f6b365e01e..5e5271a58a 100644
--- a/roles/openvpn/base/tasks/main.yml
+++ b/roles/openvpn/base/tasks/main.yml
@@ -24,10 +24,10 @@
   tags:
   - install
   - openvpn
-  notify:
-  - restart openvpn (Fedora)
-  - restart openvpn (RHEL7)
-  - restart openvpn (RHEL6)
+  #notify:
+  #- restart openvpn (Fedora)
+  #- restart openvpn (RHEL7)
+  #- restart openvpn (RHEL6)
 
 - name: install fix-routes.sh script
   copy: src=fix-routes.sh