diff --git a/metznet/system/base-system.scm b/metznet/system/base-system.scm
index b7e7010..65c2459 100644
--- a/metznet/system/base-system.scm
+++ b/metznet/system/base-system.scm
@@ -331,6 +331,18 @@
                                                                        "KerberosAuthentication yes")
                                                                       "\n"))))
         (service krb5-service-type %metznet-krb5-config)
+        (service openvpn-client-service-type
+                 (openvpn-client-configuration (ca "/var/lib/openvpn/ca.crt")
+                                               (cert
+                                                "/var/lib/openvpn/client.crt")
+                                               (key
+                                                "/var/lib/openvpn/client.key")
+                                               (tls-auth
+                                                "/var/lib/openvpn/ta.key")
+                                               (persist-key? #f)
+                                               (remote (list (openvpn-remote-configuration
+                                                              (name
+                                                               "vpn.metznet.ca"))))))
         (service pam-krb5-service-type
                  (pam-krb5-configuration (pam-krb5 pam-krb5)
                                          (minimum-uid 1000)))
@@ -358,11 +370,7 @@
                          (sddm-configuration)))
           (modify-services %desktop-services
             (delete gdm-service-type)
-            (nscd-service-type config => %metznet-nscd-configuration)
-            (network-manager-service-type config =>
-                                          (network-manager-configuration (vpn-plugins
-                                                                          (list
-                                                                           network-manager-openvpn)))))))
+            (nscd-service-type config => %metznet-nscd-configuration))))
 
 (define %base-services-nscd
   (modify-services %base-services
@@ -371,20 +379,7 @@
 (define %server-services
   (append %metznet-services
           (list (service dbus-root-service-type)
-                (service dhcp-client-service-type)
-                (service openvpn-client-service-type
-                         (openvpn-client-configuration (ca
-                                                        "/var/lib/openvpn/ca.crt")
-                                                       (cert
-                                                        "/var/lib/openvpn/client.crt")
-                                                       (key
-                                                        "/var/lib/openvpn/client.key")
-                                                       (tls-auth
-                                                        "/var/lib/openvpn/ta.key")
-                                                       (persist-key? #f)
-                                                       (remote (list (openvpn-remote-configuration
-                                                                      (name
-                                                                       "vpn.metznet.ca")))))))))
+                (service dhcp-client-service-type))))
 
 (define %metznet-server-services
   (append %server-services %base-services-nscd))