diff --git a/roles/core/letsencrypt/certificates.sls b/roles/webserver-core/letsencrypt/certificates.sls
similarity index 100%
rename from roles/core/letsencrypt/certificates.sls
rename to roles/webserver-core/letsencrypt/certificates.sls
diff --git a/roles/core/letsencrypt/files/cli.ini b/roles/webserver-core/letsencrypt/files/cli.ini
similarity index 100%
rename from roles/core/letsencrypt/files/cli.ini
rename to roles/webserver-core/letsencrypt/files/cli.ini
diff --git a/roles/core/letsencrypt/files/letsencrypt-renew.service b/roles/webserver-core/letsencrypt/files/letsencrypt-renew.service
similarity index 100%
rename from roles/core/letsencrypt/files/letsencrypt-renew.service
rename to roles/webserver-core/letsencrypt/files/letsencrypt-renew.service
diff --git a/roles/core/letsencrypt/files/letsencrypt-renew.timer b/roles/webserver-core/letsencrypt/files/letsencrypt-renew.timer
similarity index 100%
rename from roles/core/letsencrypt/files/letsencrypt-renew.timer
rename to roles/webserver-core/letsencrypt/files/letsencrypt-renew.timer
diff --git a/roles/core/letsencrypt/files/letsencrypt-renewal.sh b/roles/webserver-core/letsencrypt/files/letsencrypt-renewal.sh
similarity index 100%
rename from roles/core/letsencrypt/files/letsencrypt-renewal.sh
rename to roles/webserver-core/letsencrypt/files/letsencrypt-renewal.sh
diff --git a/roles/core/letsencrypt/init.sls b/roles/webserver-core/letsencrypt/init.sls
similarity index 100%
rename from roles/core/letsencrypt/init.sls
rename to roles/webserver-core/letsencrypt/init.sls
diff --git a/roles/core/letsencrypt/service.sls b/roles/webserver-core/letsencrypt/service.sls
similarity index 100%
rename from roles/core/letsencrypt/service.sls
rename to roles/webserver-core/letsencrypt/service.sls
diff --git a/roles/core/letsencrypt/software.sls b/roles/webserver-core/letsencrypt/software.sls
similarity index 100%
rename from roles/core/letsencrypt/software.sls
rename to roles/webserver-core/letsencrypt/software.sls
diff --git a/top.sls b/top.sls
index 9ce07b8..cde9a4f 100644
--- a/top.sls
+++ b/top.sls
@@ -1,35 +1,35 @@
 #   -------------------------------------------------------------
 #   Salt configuration for Nasqueron servers
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   Created:        2016-04-10
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
 base:
   '*':
     - roles/core/rc
     - roles/core/hostname
     - roles/core/network
     - roles/core/motd
     - roles/core/rsyslog
     - roles/core/salt
     - roles/core/sshd
-    - roles/core/letsencrypt
   'local':
     - roles/saltmaster/sudo
     - roles/saltmaster/salt-wrapper
   'ysul.nasqueron.org':
     - roles/webserver-legacy
     - roles/webserver-varnish
   'dwellers.nasqueron.org':
     - roles/paas-docker/docker
     - roles/paas-lxc/lxc
     - roles/mastodon
   'eglide':
+    - roles/webserver-core/letsencrypt
     - roles/shellserver/users
     - roles/shellserver/userland-software
     - roles/shellserver/eglide-website
     - roles/shellserver/vhosts
     - roles/shellserver/web-hosting
     - roles/shellserver/odderon