diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml
index c46bfe997..1845416dc 100644
--- a/roles/1-prep/tasks/main.yml
+++ b/roles/1-prep/tasks/main.yml
@@ -37,6 +37,12 @@
   set_fact:
     uuid: "{{ stored_uuid.stdout_lines[0] }}"
 
+- name: OPENVPN
+  include_role:
+    name: openvpn
+  when: openvpn_install
+  tags: openvpn
+
 # for rpi, without rtc, we need time as soon as possible
 - name: Install chrony package
   package:
diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index fbe551818..8989677a6 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -10,12 +10,6 @@
   # has no "when: XXXXX_install" flag
   tags: base, sshd
 
-- name: OPENVPN
-  include_role:
-    name: openvpn
-  when: openvpn_install
-  tags: openvpn
-
 - name: Installing dnsmasq
   include_tasks: roles/network/tasks/dnsmasq.yml
   when: dnsmasq_install