diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml
index 7079e6119a..b91b9ab79e 100644
--- a/roles/openvpn/base/tasks/main.yml
+++ b/roles/openvpn/base/tasks/main.yml
@@ -21,6 +21,7 @@
       mode: 0644 }
   tags:
   - install
+  - openvpn
   notify:
   - restart openvpn {{ ansible_distribution_version[0] }}
 
diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index 3faa3b8dd0..43329e87a0 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -7,6 +7,7 @@
   - openvpn
   tags:
   - packages
+  - openvpn
 
 - name: Install configuration files
   file: src={{ item.file }}
@@ -24,6 +25,7 @@
       mode: 0600 }
   tags:
   - install
+  - openvpn
   notify:
   - restart openvpn {{ ansible_distribution_version[0] }}
 
@@ -32,10 +34,12 @@
   when: ansible_distribution_version[0] == 6 or is_fedora is defined
   tags:
   - service
+  - openvpn
 
 - name: enable openvpn service for rhel 7
   service: name=openvpn@openvpn state=running enabled=true
   when: ansible_distribution_version[0] == 7
   tags:
   - service
+  - openvpn
 
diff --git a/roles/openvpn/server/tasks/main.yml b/roles/openvpn/server/tasks/main.yml
index 6cebde4152..0df7ea26a1 100644
--- a/roles/openvpn/server/tasks/main.yml
+++ b/roles/openvpn/server/tasks/main.yml
@@ -7,6 +7,7 @@
   - openvpn
   tags:
   - packages
+  - openvpn
 
 - name: Create the /etc/openvpn/ccd/ directory
   file: >
@@ -15,6 +16,8 @@
     owner=root
     group=root
     state=directory
+  tags:
+  - openvpn
 
 - name: Install configuration files
   file: src={{ item.file }}
@@ -35,6 +38,7 @@
       mode: 0644 }
   tags:
   - install
+  - openvpn
   notify:
   - restart openvpn {{ ansible_distribution_version[0] }}
 
@@ -43,6 +47,8 @@
   file: file src={{ files }}/ccd/ dest=/etc/openvpn/ccd/ recurse=true 
   notify:
   - restart openvpn {{ ansible_distribution_version[0] }}
+  tags:
+  - openvpn
 
 
 - name: enable openvpn service for rhel 6 or Fedora
@@ -50,10 +56,12 @@
   when: ansible_distribution_version[0] == 6 or is_fedora is defined
   tags:
   - service
+  - openvpn
 
 - name: enable openvpn service for rhel 7
   service: name=openvpn@openvpn state=running enabled=true
   when: ansible_distribution_version[0] == 7
   tags:
   - service
+  - openvpn