diff --git a/playbooks/dna-gw.yml b/playbooks/dna-gw.yml
index 224c9a1..f94117c 100644
--- a/playbooks/dna-gw.yml
+++ b/playbooks/dna-gw.yml
@@ -17,7 +17,7 @@
     - ifstated
     - dhcpd
     - nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: gw.home.foo.sh
     - tftp
     - websockify
diff --git a/playbooks/mail.yml b/playbooks/mail.yml
index 072587d..ca0bf58 100644
--- a/playbooks/mail.yml
+++ b/playbooks/mail.yml
@@ -34,7 +34,7 @@
     - autofs
     - dovecot
     - role: nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: "{{ mail_server }}"
       redirect: https://webmail.foo.sh/
     - grossd
diff --git a/playbooks/mqtt.yml b/playbooks/mqtt.yml
index 1a37f6e..89edf93 100644
--- a/playbooks/mqtt.yml
+++ b/playbooks/mqtt.yml
@@ -14,5 +14,5 @@
     - mosquitto
     - telegraf
     - nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: iot.foo.sh
diff --git a/playbooks/nms.yml b/playbooks/nms.yml
index 9900ec7..848ee50 100644
--- a/playbooks/nms.yml
+++ b/playbooks/nms.yml
@@ -26,7 +26,7 @@
   roles:
     - base
     - nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: oob.foo.sh
     - sssd
     - mkhomedir
diff --git a/playbooks/ns.yml b/playbooks/ns.yml
index 495e358..82cca51 100644
--- a/playbooks/ns.yml
+++ b/playbooks/ns.yml
@@ -16,7 +16,7 @@
     - base
     - nsd
     - role: nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: "{{ nsd_server }}"
       redirect: https://www.foo.sh/
     - role: ifstated
diff --git a/playbooks/proxy.yml b/playbooks/proxy.yml
index 104f9fe..11ef140 100644
--- a/playbooks/proxy.yml
+++ b/playbooks/proxy.yml
@@ -16,93 +16,93 @@
     - base
     - ifstated
     - nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: ca.foo.sh
-    - role: nginx/site
+    - role: nginx_site
       site: foo.monster
-    - role: nginx/site
+    - role: nginx_site
       site: tuiradc.fi
       redirect: https://facebook.com/TuiraDC
-    - role: nginx/site
+    - role: nginx_site
       site: www.tuiradc.fi
       redirect: https://facebook.com/TuiraDC
-    - role: nginx/site
+    - role: nginx_site
       site: foo.sh
       redirect: https://www.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: autoconfig.foo.sh
-    - role: nginx/site
+    - role: nginx_site
       site: boot.foo.sh
       ssl_config: old
-    - role: nginx/site
+    - role: nginx_site
       site: bitbucket.foo.sh
       redirect: https://bitbucket.org/tmakinen/
-    - role: nginx/site
+    - role: nginx_site
       site: certbot.home.foo.sh
       proxy: https://certbot.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: chat.foo.sh
       proxy:
         - https://oci-node01.home.foo.sh/rocketchat/
         - https://oci-node02.home.foo.sh/rocketchat/
-    - role: nginx/site
+    - role: nginx_site
       site: collab.foo.sh
       proxy: https://collab01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: devel01.foo.sh
       proxy: https://devel01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: dns.home.foo.sh
       redirect: https://www.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: git.foo.sh
       proxy: https://gitea02.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: gitea.foo.sh
       redirect: https://git.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: ha.foo.sh
       proxy: https://homeassistant01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: id.foo.sh
       proxy:
         - https://oci-node01.home.foo.sh
         - https://oci-node02.home.foo.sh
-    - role: nginx/site
+    - role: nginx_site
       site: influxdb.foo.sh
       proxy: https://influxdb01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: iot.foo.sh
       redirect: https://www.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: munin.foo.sh
       proxy: https://munin01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: mirrors.foo.sh
       proxy: https://mirror01.home.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: movies.foo.sh
       proxy:
         - https://oci-node01.home.foo.sh/php4dvd/
-    - role: nginx/site
+    - role: nginx_site
       site: noc.foo.sh
       proxy:
         - https://oci-node01.home.foo.sh/grafana/
         - https://oci-node02.home.foo.sh/grafana/
-    - role: nginx/site
+    - role: nginx_site
       site: print.foo.sh
       proxy: https://print01.home.foo.sh:631/
-    - role: nginx/site
+    - role: nginx_site
       site: registry.foo.sh
       proxy: ["registry01.home.foo.sh:5000", "registry02.home.foo.sh:5000"]
-    - role: nginx/site
+    - role: nginx_site
       site: webmail.foo.sh
       proxy:
         - https://oci-node01.home.foo.sh/roundcube/
-    - role: nginx/site
+    - role: nginx_site
       site: wpad.foo.sh
-    - role: nginx/site
+    - role: nginx_site
       site: www.foo.sh
-    - role: nginx/site
+    - role: nginx_site
       site: zm.foo.sh
       proxy: https://zm02.home.foo.sh/
diff --git a/playbooks/relay.yml b/playbooks/relay.yml
index f6cd46d..9ed46a0 100644
--- a/playbooks/relay.yml
+++ b/playbooks/relay.yml
@@ -17,12 +17,12 @@
     - ifstated
     - relayd
     - nginx/server
-    - role: nginx/site
+    - role: nginx_site
       site: ldap.foo.sh
       redirect: https://www.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: ldap01.foo.sh
       redirect: https://www.foo.sh/
-    - role: nginx/site
+    - role: nginx_site
       site: loghost.foo.sh
       redirect: https://www.foo.sh/
diff --git a/roles/certbot/tasks/main.yml b/roles/certbot/tasks/main.yml
index b66300b..1a4cbb7 100644
--- a/roles/certbot/tasks/main.yml
+++ b/roles/certbot/tasks/main.yml
@@ -21,7 +21,7 @@
 
 - name: Add certbot nginx site
   ansible.builtin.include_role:
-    name: nginx/site
+    name: nginx_site
   vars:
     site: certbot.home.foo.sh
 
diff --git a/roles/nginx/site/tasks/main.yml b/roles/nginx_site/tasks/main.yml
similarity index 100%
rename from roles/nginx/site/tasks/main.yml
rename to roles/nginx_site/tasks/main.yml
diff --git a/roles/nginx/site/templates/git.foo.sh.conf.j2 b/roles/nginx_site/templates/git.foo.sh.conf.j2
similarity index 100%
rename from roles/nginx/site/templates/git.foo.sh.conf.j2
rename to roles/nginx_site/templates/git.foo.sh.conf.j2
diff --git a/roles/nginx/site/templates/gw.home.foo.sh.conf.j2 b/roles/nginx_site/templates/gw.home.foo.sh.conf.j2
similarity index 100%
rename from roles/nginx/site/templates/gw.home.foo.sh.conf.j2
rename to roles/nginx_site/templates/gw.home.foo.sh.conf.j2
diff --git a/roles/nginx/site/templates/registry.foo.sh.conf.j2 b/roles/nginx_site/templates/registry.foo.sh.conf.j2
similarity index 100%
rename from roles/nginx/site/templates/registry.foo.sh.conf.j2
rename to roles/nginx_site/templates/registry.foo.sh.conf.j2
diff --git a/roles/nginx/site/templates/site.conf.j2 b/roles/nginx_site/templates/site.conf.j2
similarity index 100%
rename from roles/nginx/site/templates/site.conf.j2
rename to roles/nginx_site/templates/site.conf.j2
diff --git a/roles/nginx/site/templates/www.foo.sh.conf.j2 b/roles/nginx_site/templates/www.foo.sh.conf.j2
similarity index 100%
rename from roles/nginx/site/templates/www.foo.sh.conf.j2
rename to roles/nginx_site/templates/www.foo.sh.conf.j2