diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json
index 5182b61..0ca0d1e 100644
--- a/nodes/akkounts-1.json
+++ b/nodes/akkounts-1.json
@@ -78,8 +78,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
+    "role[ldap_client]",
     "role[akkounts]"
   ]
-}
\ No newline at end of file
+}
diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json
index 18e81cc..8645317 100644
--- a/nodes/ejabberd-4.json
+++ b/nodes/ejabberd-4.json
@@ -59,8 +59,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
+    "role[ldap_client]",
     "role[ejabberd]"
   ]
-}
\ No newline at end of file
+}
diff --git a/nodes/ejabberd-8.json b/nodes/ejabberd-8.json
index 71c7504..f06d5a6 100644
--- a/nodes/ejabberd-8.json
+++ b/nodes/ejabberd-8.json
@@ -57,8 +57,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
+    "role[ldap_client]",
     "role[ejabberd]"
   ]
 }
diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json
index d326adc..f386f88 100644
--- a/nodes/gitea-2.json
+++ b/nodes/gitea-2.json
@@ -64,6 +64,7 @@
   "run_list": [
     "role[base]",
     "role[kvm_guest]",
+    "role[ldap_client]",
     "role[garage_gateway]",
     "role[gitea]"
   ]
diff --git a/nodes/wiki-1.json b/nodes/wiki-1.json
index b2bac6b..22f5c17 100644
--- a/nodes/wiki-1.json
+++ b/nodes/wiki-1.json
@@ -74,8 +74,9 @@
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
+    "role[ldap_client]",
     "recipe[kosmos-mediawiki]"
   ]
-}
\ No newline at end of file
+}
diff --git a/roles/ldap_client.rb b/roles/ldap_client.rb
new file mode 100644
index 0000000..03abbf4
--- /dev/null
+++ b/roles/ldap_client.rb
@@ -0,0 +1,5 @@
+name "ldap_client"
+
+run_list %w(
+  kosmos-dirsrv::hostsfile
+)
diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb
index 9b2d290..efd8f63 100644
--- a/site-cookbooks/kosmos-akkounts/recipes/default.rb
+++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb
@@ -22,7 +22,6 @@ package "libpq-dev"
 
 include_recipe 'kosmos-nodejs'
 include_recipe "kosmos-redis"
-include_recipe "kosmos-dirsrv::hostsfile"
 
 npm_package "yarn" do
   version "1.22.4"
diff --git a/site-cookbooks/kosmos-dirsrv/recipes/default.rb b/site-cookbooks/kosmos-dirsrv/recipes/default.rb
index 5ab07bb..c79e329 100644
--- a/site-cookbooks/kosmos-dirsrv/recipes/default.rb
+++ b/site-cookbooks/kosmos-dirsrv/recipes/default.rb
@@ -3,8 +3,6 @@
 # Recipe:: default
 #
 
-include_recipe "kosmos-dirsrv::hostsfile"
-
 credentials = data_bag_item("credentials", "dirsrv")
 
 dirsrv_instance "master" do
diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index e742a97..6573631 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -3,8 +3,6 @@
 # Recipe:: default
 #
 
-include_recipe "kosmos-dirsrv::hostsfile"
-
 ejabberd_credentials = data_bag_item("credentials", "ejabberd")
 
 ejabberd_version = node["kosmos-ejabberd"]["version"]
diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
index 4f24146..7cbfcdf 100644
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb
@@ -27,7 +27,6 @@
 include_recipe 'apt'
 include_recipe 'ark'
 include_recipe 'composer'
-include_recipe 'kosmos-dirsrv::hostsfile'
 
 server_name = 'wiki.kosmos.org'
 
diff --git a/site-cookbooks/kosmos_gitea/recipes/default.rb b/site-cookbooks/kosmos_gitea/recipes/default.rb
index 8327ae1..ad127ab 100644
--- a/site-cookbooks/kosmos_gitea/recipes/default.rb
+++ b/site-cookbooks/kosmos_gitea/recipes/default.rb
@@ -3,8 +3,6 @@
 # Recipe:: default
 #
 
-include_recipe "kosmos-dirsrv::hostsfile"
-
 working_directory         = node["gitea"]["working_directory"]
 git_home_directory        = "/home/git"
 repository_root_directory = "#{git_home_directory}/gitea-repositories"