6 files changed, 11 insertions, 7 deletions
diff --git a/common/kubernetes.yml b/common/kubernetes.yml
index d5b58767..27da0bf1 100644
--- a/common/kubernetes.yml
+++ b/common/kubernetes.yml
@@ -38,6 +38,8 @@
 - name: kubernetes base installation
   hosts: _kubernetes_nodes_
   roles:
+  - role: apt-repo/spreadspace
+    when: kubernetes_network_plugin == 'kubeguard'
   - role: kubernetes/net/kubeguard
     when: kubernetes_network_plugin == 'kubeguard'
   - role: kubernetes/base
diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml
index 5975014f..fb6defaa 100644
--- a/dan/ele-gwhetzner.yml
+++ b/dan/ele-gwhetzner.yml
@@ -5,5 +5,6 @@
   - role: base
   - role: sshd
   - role: zsh
+  - role: apt-repo/spreadspace
   - role: wireguard/base
   - role: wireguard/gateway
diff --git a/roles/wireguard/base/meta/main.yml b/roles/wireguard/base/meta/main.yml
deleted file mode 100644
index 3542c2fa..00000000
--- a/roles/wireguard/base/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-dependencies:
-- role: prepare-dkms
-- role: apt-repo/spreadspace
diff --git a/roles/wireguard/base/tasks/main.yml b/roles/wireguard/base/tasks/main.yml
index 11761c33..6b7cea23 100644
--- a/roles/wireguard/base/tasks/main.yml
+++ b/roles/wireguard/base/tasks/main.yml
@@ -1,4 +1,8 @@
 ---
+- name: install dkms
+  import_role:
+    name: prepare-dkms
+
 - name: install wireguard packages
   apt:
     name:
diff --git a/roles/zfs/base/meta/main.yml b/roles/zfs/base/meta/main.yml
deleted file mode 100644
index 300d0ccf..00000000
--- a/roles/zfs/base/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-- role: prepare-dkms
diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/zfs/base/tasks/Debian.yml
index 450d9300..b9fdda95 100644
--- a/roles/zfs/base/tasks/Debian.yml
+++ b/roles/zfs/base/tasks/Debian.yml
@@ -1,4 +1,8 @@
 ---
+- name: install dkms
+  import_role:
+    name: prepare-dkms
+
 ## TODO: make sure contrib repo is enabled
 
 - name: install zfs-dkms