diff --git a/host/montalin/default.nix b/host/montalin/default.nix
index 110f5b7..35ba1fe 100644
--- a/host/montalin/default.nix
+++ b/host/montalin/default.nix
@@ -10,7 +10,6 @@
     ../../hardware/nuc.nix
 
     ../../role/base
-    ../../role/dropbear
     ../../role/webserver
   ];
 
diff --git a/modules/default.nix b/modules/default.nix
index 8a65e4b..d2779ce 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }: {
 
-  imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ];
+  imports = [ ./router ./router-dhcp ./router-dns ./router-wireless-ap ./wwan ./luks-ssh ];
 
 }
diff --git a/role/dropbear/default.nix b/modules/luks-ssh/default.nix
similarity index 100%
rename from role/dropbear/default.nix
rename to modules/luks-ssh/default.nix
diff --git a/role/README.adoc b/role/README.adoc
index e7aba31..6a84567 100644
--- a/role/README.adoc
+++ b/role/README.adoc
@@ -2,12 +2,5 @@
 
 :toc:
 
-include::backup/README.adoc[]
-
 include::base/README.adoc[]
 
-include::dropbear/README.adoc[]
-
-include::router/README.adoc[]
-
-include::wwan/README.adoc[]
diff --git a/role/dropbear/README.adoc b/role/dropbear/README.adoc
deleted file mode 100644
index e6667ff..0000000
--- a/role/dropbear/README.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-== Dropbear Role
-
-Configuration of dropbear to allow HDD decryption from a remote host.
-
-Note: This role requires manually creating of persistant SSH-Keys with
-`dropbearkey -t <type> -f <output-keyfile>`