diff --git a/playbooks/all.yml b/playbooks/all.yml
index e7096f5f3d5b99a281a69083d76f15aa377e9c7d..7ddf1881c11f9b8d47f01a0e3f02c3528b96f018 100644
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -5,9 +5,9 @@
 
 - hosts: sso-server
   roles:
-    - sso-server
+    - float-infra-sso-server
 
 - hosts: user-meta-server
   roles:
-    - sso-server
+    - float-infra-sso-server
 
diff --git a/playbooks/base.yml b/playbooks/base.yml
index c69d94af3281d46c80ae94a8081f23aab9e05d6e..5178dc2a76a8ea61361fd4c2c4d8388b702ef380 100644
--- a/playbooks/base.yml
+++ b/playbooks/base.yml
@@ -2,10 +2,10 @@
 
 - hosts: all
   roles:
-    - base
-    - float-credentials
-    - vagrant-compat
+    - float-base
+    - float-base-service-credentials
+    - float-util-vagrant-compat
 
 - hosts: net-overlay
   roles:
-    - net-overlay
+    - float-base-net-overlay
diff --git a/playbooks/docker.yml b/playbooks/docker.yml
index 4a1db9821dd2b3d8fca0bbef93f80f23383fd4a7..05ffdd34797bddac2366929c9b75f7ae18fdb24d 100644
--- a/playbooks/docker.yml
+++ b/playbooks/docker.yml
@@ -2,7 +2,7 @@
 
 - hosts: all
   roles:
-    - docker
+    - float-base-docker
   serial:
     - 1
     - 2
diff --git a/playbooks/frontend.yml b/playbooks/frontend.yml
index f39b62eab513c48eb0427bafe52e06de35a3a246..eacd350f62a6c338ad2744d10ecc5ba21cc10a92 100644
--- a/playbooks/frontend.yml
+++ b/playbooks/frontend.yml
@@ -4,19 +4,19 @@
 
 - hosts: frontend
   roles:
-    - nginx
-    - dns
-    - haproxy
+    - float-infra-nginx
+    - float-infra-dns
+    - float-infra-haproxy
 
 - hosts: admin-dashboard
   roles:
-    - admin-dashboard
+    - float-infra-admin-dashboard
 
 - hosts: acme
   roles:
-    - acme
+    - float-infra-acme
 
 - hosts: reports-collector
   roles:
-    - reports-collector
+    - float-infra-reports-collector
 
diff --git a/playbooks/infra.yml b/playbooks/infra.yml
index c2722bb7f59085410f1ed9ce4de41cd514b47752..30a95def19d8438b2b55a43c6357d19a4ae39ce8 100644
--- a/playbooks/infra.yml
+++ b/playbooks/infra.yml
@@ -14,9 +14,9 @@
 
 - hosts: log-collector
   roles:
-    - log-collector
+    - float-infra-log-collector
 
 - hosts: backup-metadata
   roles:
-    - backup-metadata
+    - float-base-backup-metadata
 
diff --git a/playbooks/prometheus-lts.yml b/playbooks/prometheus-lts.yml
index b8cbc09cb6c46c37c746399ce5e820bb9fb72bed..4b9135a70b59b7ba342197537bacc8afc65c834a 100644
--- a/playbooks/prometheus-lts.yml
+++ b/playbooks/prometheus-lts.yml
@@ -1,8 +1,8 @@
 - hosts: prometheus-lts
   roles:
-    - prometheus-lts
+    - float-infra-prometheus-lts
 
 # Configure 'thanos query' on 'prometheus' hosts to discover prometheus-lts
 - hosts: prometheus
   roles:
-    - thanos-query-lts
+    - float-infra-thanos-query-lts
diff --git a/playbooks/prometheus.yml b/playbooks/prometheus.yml
index de5f9ce264d6fa520782c4d4c21a8089677c9083..8fad529b411f5ad5abc3beeb7f108ef460f0c508 100644
--- a/playbooks/prometheus.yml
+++ b/playbooks/prometheus.yml
@@ -2,5 +2,5 @@
 
 - hosts: prometheus
   roles:
-    - prometheus
+    - float-infra-prometheus
 
diff --git a/playbooks/volumes.yml b/playbooks/volumes.yml
index 1c63b3ce81e0101ab391504db0dc44f93597b29f..99bb0b9ee2b81911f7683eeeaf01e5277fcbc873 100644
--- a/playbooks/volumes.yml
+++ b/playbooks/volumes.yml
@@ -2,5 +2,5 @@
 
 - hosts: all
   roles:
-    - volumemgr
+    - float-base-volumemgr
 
diff --git a/roles/README.md b/roles/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..412b10ae2863f981cd5374b050f0feee82f57246
--- /dev/null
+++ b/roles/README.md
@@ -0,0 +1,16 @@
+Roles in this directory all share a "float-" prefix to avoid collisions
+with user-defined roles. They are roughly grouped into sections:
+
+* *base* for the most low-level functionality, setting up the machines
+  and preparing them to run cointainers, along with distributing the
+  necessary credentials.
+
+* *infra* for roles meant to configure specific services that are part
+  of the wider float "infrastructure" (but with few exceptions run on
+  top of the *base* layer, i.e. within containers etc).
+
+* *util* for internal roles that are included by other roles, either to
+  expose common functionality to user roles (geoip, mariadb instances),
+  or to handle Ansible-related logic shared by multiple roles.
+
+
diff --git a/roles/backup-metadata/README.md b/roles/float-base-backup-metadata/README.md
similarity index 100%
rename from roles/backup-metadata/README.md
rename to roles/float-base-backup-metadata/README.md
diff --git a/roles/backup-metadata/handlers/main.yml b/roles/float-base-backup-metadata/handlers/main.yml
similarity index 100%
rename from roles/backup-metadata/handlers/main.yml
rename to roles/float-base-backup-metadata/handlers/main.yml
diff --git a/roles/backup-metadata/tasks/main.yml b/roles/float-base-backup-metadata/tasks/main.yml
similarity index 100%
rename from roles/backup-metadata/tasks/main.yml
rename to roles/float-base-backup-metadata/tasks/main.yml
diff --git a/roles/backup-metadata/templates/metadb.service.j2 b/roles/float-base-backup-metadata/templates/metadb.service.j2
similarity index 100%
rename from roles/backup-metadata/templates/metadb.service.j2
rename to roles/float-base-backup-metadata/templates/metadb.service.j2
diff --git a/roles/backup-metadata/templates/metadb.yml.j2 b/roles/float-base-backup-metadata/templates/metadb.yml.j2
similarity index 100%
rename from roles/backup-metadata/templates/metadb.yml.j2
rename to roles/float-base-backup-metadata/templates/metadb.yml.j2
diff --git a/roles/docker/README.md b/roles/float-base-docker/README.md
similarity index 100%
rename from roles/docker/README.md
rename to roles/float-base-docker/README.md
diff --git a/roles/docker/defaults/main.yml b/roles/float-base-docker/defaults/main.yml
similarity index 100%
rename from roles/docker/defaults/main.yml
rename to roles/float-base-docker/defaults/main.yml
diff --git a/roles/docker/files/seccomp-0.3.2.json b/roles/float-base-docker/files/seccomp-0.3.2.json
similarity index 100%
rename from roles/docker/files/seccomp-0.3.2.json
rename to roles/float-base-docker/files/seccomp-0.3.2.json
diff --git a/roles/docker/handlers/main.yml b/roles/float-base-docker/handlers/main.yml
similarity index 100%
rename from roles/docker/handlers/main.yml
rename to roles/float-base-docker/handlers/main.yml
diff --git a/roles/docker/tasks/docker.yml b/roles/float-base-docker/tasks/docker.yml
similarity index 100%
rename from roles/docker/tasks/docker.yml
rename to roles/float-base-docker/tasks/docker.yml
diff --git a/roles/docker/tasks/main.yml b/roles/float-base-docker/tasks/main.yml
similarity index 100%
rename from roles/docker/tasks/main.yml
rename to roles/float-base-docker/tasks/main.yml
diff --git a/roles/docker/tasks/podman.yml b/roles/float-base-docker/tasks/podman.yml
similarity index 100%
rename from roles/docker/tasks/podman.yml
rename to roles/float-base-docker/tasks/podman.yml
diff --git a/roles/docker/tasks/start.yml b/roles/float-base-docker/tasks/start.yml
similarity index 100%
rename from roles/docker/tasks/start.yml
rename to roles/float-base-docker/tasks/start.yml
diff --git a/roles/docker/templates/cleanup.sh.j2 b/roles/float-base-docker/templates/cleanup.sh.j2
similarity index 100%
rename from roles/docker/templates/cleanup.sh.j2
rename to roles/float-base-docker/templates/cleanup.sh.j2
diff --git a/roles/docker/templates/container-limits.j2 b/roles/float-base-docker/templates/container-limits.j2
similarity index 100%
rename from roles/docker/templates/container-limits.j2
rename to roles/float-base-docker/templates/container-limits.j2
diff --git a/roles/docker/templates/daemon.json.j2 b/roles/float-base-docker/templates/daemon.json.j2
similarity index 100%
rename from roles/docker/templates/daemon.json.j2
rename to roles/float-base-docker/templates/daemon.json.j2
diff --git a/roles/docker/templates/float-pull-image.j2 b/roles/float-base-docker/templates/float-pull-image.j2
similarity index 100%
rename from roles/docker/templates/float-pull-image.j2
rename to roles/float-base-docker/templates/float-pull-image.j2
diff --git a/roles/docker/templates/in-container.j2 b/roles/float-base-docker/templates/in-container.j2
similarity index 100%
rename from roles/docker/templates/in-container.j2
rename to roles/float-base-docker/templates/in-container.j2
diff --git a/roles/docker/templates/run.sh.j2 b/roles/float-base-docker/templates/run.sh.j2
similarity index 100%
rename from roles/docker/templates/run.sh.j2
rename to roles/float-base-docker/templates/run.sh.j2
diff --git a/roles/docker/templates/systemd.j2 b/roles/float-base-docker/templates/systemd.j2
similarity index 100%
rename from roles/docker/templates/systemd.j2
rename to roles/float-base-docker/templates/systemd.j2
diff --git a/roles/net-overlay/README.md b/roles/float-base-net-overlay/README.md
similarity index 100%
rename from roles/net-overlay/README.md
rename to roles/float-base-net-overlay/README.md
diff --git a/roles/net-overlay/handlers/main.yml b/roles/float-base-net-overlay/handlers/main.yml
similarity index 100%
rename from roles/net-overlay/handlers/main.yml
rename to roles/float-base-net-overlay/handlers/main.yml
diff --git a/roles/net-overlay/tasks/configure_netoverlay_tinc.yml b/roles/float-base-net-overlay/tasks/configure_netoverlay_tinc.yml
similarity index 100%
rename from roles/net-overlay/tasks/configure_netoverlay_tinc.yml
rename to roles/float-base-net-overlay/tasks/configure_netoverlay_tinc.yml
diff --git a/roles/net-overlay/tasks/main.yml b/roles/float-base-net-overlay/tasks/main.yml
similarity index 100%
rename from roles/net-overlay/tasks/main.yml
rename to roles/float-base-net-overlay/tasks/main.yml
diff --git a/roles/net-overlay/templates/firewall/11net-overlay.j2 b/roles/float-base-net-overlay/templates/firewall/11net-overlay.j2
similarity index 100%
rename from roles/net-overlay/templates/firewall/11net-overlay.j2
rename to roles/float-base-net-overlay/templates/firewall/11net-overlay.j2
diff --git a/roles/net-overlay/templates/tinc/rkt.conf b/roles/float-base-net-overlay/templates/tinc/rkt.conf
similarity index 100%
rename from roles/net-overlay/templates/tinc/rkt.conf
rename to roles/float-base-net-overlay/templates/tinc/rkt.conf
diff --git a/roles/net-overlay/templates/tinc/tinc-down.j2 b/roles/float-base-net-overlay/templates/tinc/tinc-down.j2
similarity index 100%
rename from roles/net-overlay/templates/tinc/tinc-down.j2
rename to roles/float-base-net-overlay/templates/tinc/tinc-down.j2
diff --git a/roles/net-overlay/templates/tinc/tinc-up.j2 b/roles/float-base-net-overlay/templates/tinc/tinc-up.j2
similarity index 100%
rename from roles/net-overlay/templates/tinc/tinc-up.j2
rename to roles/float-base-net-overlay/templates/tinc/tinc-up.j2
diff --git a/roles/net-overlay/templates/tinc/tinc.conf.j2 b/roles/float-base-net-overlay/templates/tinc/tinc.conf.j2
similarity index 100%
rename from roles/net-overlay/templates/tinc/tinc.conf.j2
rename to roles/float-base-net-overlay/templates/tinc/tinc.conf.j2
diff --git a/roles/public-credentials/README.md b/roles/float-base-public-credentials/README.md
similarity index 100%
rename from roles/public-credentials/README.md
rename to roles/float-base-public-credentials/README.md
diff --git a/roles/public-credentials/defaults/main.yml b/roles/float-base-public-credentials/defaults/main.yml
similarity index 100%
rename from roles/public-credentials/defaults/main.yml
rename to roles/float-base-public-credentials/defaults/main.yml
diff --git a/roles/public-credentials/meta/main.yml b/roles/float-base-public-credentials/meta/main.yml
similarity index 100%
rename from roles/public-credentials/meta/main.yml
rename to roles/float-base-public-credentials/meta/main.yml
diff --git a/roles/public-credentials/tasks/by_service.yml b/roles/float-base-public-credentials/tasks/by_service.yml
similarity index 100%
rename from roles/public-credentials/tasks/by_service.yml
rename to roles/float-base-public-credentials/tasks/by_service.yml
diff --git a/roles/public-credentials/tasks/by_type.yml b/roles/float-base-public-credentials/tasks/by_type.yml
similarity index 94%
rename from roles/public-credentials/tasks/by_type.yml
rename to roles/float-base-public-credentials/tasks/by_type.yml
index b9ff08784a6439ba9219e793c941e545173d59f1..714a404c74f2dd1d8666f25b421c16bc404a6ada 100644
--- a/roles/public-credentials/tasks/by_type.yml
+++ b/roles/float-base-public-credentials/tasks/by_type.yml
@@ -25,6 +25,6 @@
 
 # Setup 'default' self-signed cert.
 - include_role:
-    name: public-ssl-cert
+    name: float-util-public-ssl-cert
   vars:
     cn: default
diff --git a/roles/public-credentials/tasks/endpoint.yml b/roles/float-base-public-credentials/tasks/endpoint.yml
similarity index 91%
rename from roles/public-credentials/tasks/endpoint.yml
rename to roles/float-base-public-credentials/tasks/endpoint.yml
index 3b83307e8be49d5975799c70022ac551e4239b47..7707e9a1bc9db781d1cce349e9765b379477a772 100644
--- a/roles/public-credentials/tasks/endpoint.yml
+++ b/roles/float-base-public-credentials/tasks/endpoint.yml
@@ -12,4 +12,4 @@
 # not exist. The 'cn' variable, required by the public-ssl-cert role,
 # is defined by the set_fact directive above.
 - include_role:
-    name: public-ssl-cert
+    name: float-util-public-ssl-cert
diff --git a/roles/public-credentials/tasks/endpoints.yml b/roles/float-base-public-credentials/tasks/endpoints.yml
similarity index 100%
rename from roles/public-credentials/tasks/endpoints.yml
rename to roles/float-base-public-credentials/tasks/endpoints.yml
diff --git a/roles/public-credentials/tasks/main.yml b/roles/float-base-public-credentials/tasks/main.yml
similarity index 100%
rename from roles/public-credentials/tasks/main.yml
rename to roles/float-base-public-credentials/tasks/main.yml
diff --git a/roles/float-credentials/README.md b/roles/float-base-service-credentials/README.md
similarity index 100%
rename from roles/float-credentials/README.md
rename to roles/float-base-service-credentials/README.md
diff --git a/roles/float-credentials/meta/main.yml b/roles/float-base-service-credentials/meta/main.yml
similarity index 72%
rename from roles/float-credentials/meta/main.yml
rename to roles/float-base-service-credentials/meta/main.yml
index bd091102e4ae2f889651266327d0651ec08b42f4..a60e6df6f945b1626bb4718b6db4e1eb5627e2c4 100644
--- a/roles/float-credentials/meta/main.yml
+++ b/roles/float-base-service-credentials/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 
 dependencies:
-  - role: credentials
+  - role: float-util-credentials
     vars:
       credentials: "{{ float_host_service_credentials }}"
 
diff --git a/roles/float-credentials/tasks/main.yml b/roles/float-base-service-credentials/tasks/main.yml
similarity index 100%
rename from roles/float-credentials/tasks/main.yml
rename to roles/float-base-service-credentials/tasks/main.yml
diff --git a/roles/volumemgr/defaults/main.yml b/roles/float-base-volumemgr/defaults/main.yml
similarity index 100%
rename from roles/volumemgr/defaults/main.yml
rename to roles/float-base-volumemgr/defaults/main.yml
diff --git a/roles/volumemgr/tasks/main.yml b/roles/float-base-volumemgr/tasks/main.yml
similarity index 100%
rename from roles/volumemgr/tasks/main.yml
rename to roles/float-base-volumemgr/tasks/main.yml
diff --git a/roles/volumemgr/tasks/service.yml b/roles/float-base-volumemgr/tasks/service.yml
similarity index 100%
rename from roles/volumemgr/tasks/service.yml
rename to roles/float-base-volumemgr/tasks/service.yml
diff --git a/roles/volumemgr/tasks/volume.yml b/roles/float-base-volumemgr/tasks/volume.yml
similarity index 100%
rename from roles/volumemgr/tasks/volume.yml
rename to roles/float-base-volumemgr/tasks/volume.yml
diff --git a/roles/base/README.md b/roles/float-base/README.md
similarity index 100%
rename from roles/base/README.md
rename to roles/float-base/README.md
diff --git a/roles/base/defaults/main.yml b/roles/float-base/defaults/main.yml
similarity index 100%
rename from roles/base/defaults/main.yml
rename to roles/float-base/defaults/main.yml
diff --git a/roles/base/files/apt/02periodic b/roles/float-base/files/apt/02periodic
similarity index 100%
rename from roles/base/files/apt/02periodic
rename to roles/float-base/files/apt/02periodic
diff --git a/roles/base/files/apt/03no-recommends b/roles/float-base/files/apt/03no-recommends
similarity index 100%
rename from roles/base/files/apt/03no-recommends
rename to roles/float-base/files/apt/03no-recommends
diff --git a/roles/base/files/apt/50unattended-upgrades b/roles/float-base/files/apt/50unattended-upgrades
similarity index 100%
rename from roles/base/files/apt/50unattended-upgrades
rename to roles/float-base/files/apt/50unattended-upgrades
diff --git a/roles/base/files/apt/deb_autistici_org.gpg b/roles/float-base/files/apt/deb_autistici_org.gpg
similarity index 100%
rename from roles/base/files/apt/deb_autistici_org.gpg
rename to roles/float-base/files/apt/deb_autistici_org.gpg
diff --git a/roles/base/files/audisp/plugins.d/json.conf b/roles/float-base/files/audisp/plugins.d/json.conf
similarity index 100%
rename from roles/base/files/audisp/plugins.d/json.conf
rename to roles/float-base/files/audisp/plugins.d/json.conf
diff --git a/roles/base/files/audisp/plugins.d/syslog.conf b/roles/float-base/files/audisp/plugins.d/syslog.conf
similarity index 100%
rename from roles/base/files/audisp/plugins.d/syslog.conf
rename to roles/float-base/files/audisp/plugins.d/syslog.conf
diff --git a/roles/base/files/default/cron b/roles/float-base/files/default/cron
similarity index 100%
rename from roles/base/files/default/cron
rename to roles/float-base/files/default/cron
diff --git a/roles/base/files/default/locale b/roles/float-base/files/default/locale
similarity index 100%
rename from roles/base/files/default/locale
rename to roles/float-base/files/default/locale
diff --git a/roles/base/files/if-changed b/roles/float-base/files/if-changed
similarity index 100%
rename from roles/base/files/if-changed
rename to roles/float-base/files/if-changed
diff --git a/roles/base/files/journald.conf b/roles/float-base/files/journald.conf
similarity index 100%
rename from roles/base/files/journald.conf
rename to roles/float-base/files/journald.conf
diff --git a/roles/base/files/motd b/roles/float-base/files/motd
similarity index 100%
rename from roles/base/files/motd
rename to roles/float-base/files/motd
diff --git a/roles/base/files/mtail.apt-preferences b/roles/float-base/files/mtail.apt-preferences
similarity index 100%
rename from roles/base/files/mtail.apt-preferences
rename to roles/float-base/files/mtail.apt-preferences
diff --git a/roles/base/files/mtail.service b/roles/float-base/files/mtail.service
similarity index 100%
rename from roles/base/files/mtail.service
rename to roles/float-base/files/mtail.service
diff --git a/roles/base/files/mtail.socket b/roles/float-base/files/mtail.socket
similarity index 100%
rename from roles/base/files/mtail.socket
rename to roles/float-base/files/mtail.socket
diff --git a/roles/base/files/mtail/counter.mtail b/roles/float-base/files/mtail/counter.mtail
similarity index 100%
rename from roles/base/files/mtail/counter.mtail
rename to roles/float-base/files/mtail/counter.mtail
diff --git a/roles/base/files/mtail/systemd.mtail b/roles/float-base/files/mtail/systemd.mtail
similarity index 100%
rename from roles/base/files/mtail/systemd.mtail
rename to roles/float-base/files/mtail/systemd.mtail
diff --git a/roles/base/files/node-exporter-scripts/md.sh b/roles/float-base/files/node-exporter-scripts/md.sh
similarity index 100%
rename from roles/base/files/node-exporter-scripts/md.sh
rename to roles/float-base/files/node-exporter-scripts/md.sh
diff --git a/roles/base/files/node-exporter-scripts/smartmon.py b/roles/float-base/files/node-exporter-scripts/smartmon.py
similarity index 100%
rename from roles/base/files/node-exporter-scripts/smartmon.py
rename to roles/float-base/files/node-exporter-scripts/smartmon.py
diff --git a/roles/base/files/node-exporter.default b/roles/float-base/files/node-exporter.default
similarity index 100%
rename from roles/base/files/node-exporter.default
rename to roles/float-base/files/node-exporter.default
diff --git a/roles/base/files/rsyslog-mtail.conf b/roles/float-base/files/rsyslog-mtail.conf
similarity index 100%
rename from roles/base/files/rsyslog-mtail.conf
rename to roles/float-base/files/rsyslog-mtail.conf
diff --git a/roles/base/files/rsyslog-timeout.conf b/roles/float-base/files/rsyslog-timeout.conf
similarity index 100%
rename from roles/base/files/rsyslog-timeout.conf
rename to roles/float-base/files/rsyslog-timeout.conf
diff --git a/roles/base/files/splay b/roles/float-base/files/splay
similarity index 100%
rename from roles/base/files/splay
rename to roles/float-base/files/splay
diff --git a/roles/base/files/ssh/moduli b/roles/float-base/files/ssh/moduli
similarity index 100%
rename from roles/base/files/ssh/moduli
rename to roles/float-base/files/ssh/moduli
diff --git a/roles/base/files/system.conf b/roles/float-base/files/system.conf
similarity index 100%
rename from roles/base/files/system.conf
rename to roles/float-base/files/system.conf
diff --git a/roles/base/handlers/main.yml b/roles/float-base/handlers/main.yml
similarity index 100%
rename from roles/base/handlers/main.yml
rename to roles/float-base/handlers/main.yml
diff --git a/roles/base/meta/main.yml b/roles/float-base/meta/main.yml
similarity index 100%
rename from roles/base/meta/main.yml
rename to roles/float-base/meta/main.yml
diff --git a/roles/base/tasks/apt.yml b/roles/float-base/tasks/apt.yml
similarity index 100%
rename from roles/base/tasks/apt.yml
rename to roles/float-base/tasks/apt.yml
diff --git a/roles/base/tasks/backup.yml b/roles/float-base/tasks/backup.yml
similarity index 100%
rename from roles/base/tasks/backup.yml
rename to roles/float-base/tasks/backup.yml
diff --git a/roles/base/tasks/backup_dataset.yml b/roles/float-base/tasks/backup_dataset.yml
similarity index 100%
rename from roles/base/tasks/backup_dataset.yml
rename to roles/float-base/tasks/backup_dataset.yml
diff --git a/roles/base/tasks/cleanup.yml b/roles/float-base/tasks/cleanup.yml
similarity index 100%
rename from roles/base/tasks/cleanup.yml
rename to roles/float-base/tasks/cleanup.yml
diff --git a/roles/base/tasks/debian_misc.yml b/roles/float-base/tasks/debian_misc.yml
similarity index 100%
rename from roles/base/tasks/debian_misc.yml
rename to roles/float-base/tasks/debian_misc.yml
diff --git a/roles/base/tasks/fail2ban.yml b/roles/float-base/tasks/fail2ban.yml
similarity index 100%
rename from roles/base/tasks/fail2ban.yml
rename to roles/float-base/tasks/fail2ban.yml
diff --git a/roles/base/tasks/firewall.yml b/roles/float-base/tasks/firewall.yml
similarity index 100%
rename from roles/base/tasks/firewall.yml
rename to roles/float-base/tasks/firewall.yml
diff --git a/roles/base/tasks/harden.yml b/roles/float-base/tasks/harden.yml
similarity index 100%
rename from roles/base/tasks/harden.yml
rename to roles/float-base/tasks/harden.yml
diff --git a/roles/base/tasks/ipmi.yml b/roles/float-base/tasks/ipmi.yml
similarity index 100%
rename from roles/base/tasks/ipmi.yml
rename to roles/float-base/tasks/ipmi.yml
diff --git a/roles/base/tasks/main.yml b/roles/float-base/tasks/main.yml
similarity index 100%
rename from roles/base/tasks/main.yml
rename to roles/float-base/tasks/main.yml
diff --git a/roles/base/tasks/osquery.yml b/roles/float-base/tasks/osquery.yml
similarity index 100%
rename from roles/base/tasks/osquery.yml
rename to roles/float-base/tasks/osquery.yml
diff --git a/roles/base/tasks/outbound_mail.yml b/roles/float-base/tasks/outbound_mail.yml
similarity index 100%
rename from roles/base/tasks/outbound_mail.yml
rename to roles/float-base/tasks/outbound_mail.yml
diff --git a/roles/base/tasks/prometheus.yml b/roles/float-base/tasks/prometheus.yml
similarity index 100%
rename from roles/base/tasks/prometheus.yml
rename to roles/float-base/tasks/prometheus.yml
diff --git a/roles/base/tasks/rollback_protection.yml b/roles/float-base/tasks/rollback_protection.yml
similarity index 100%
rename from roles/base/tasks/rollback_protection.yml
rename to roles/float-base/tasks/rollback_protection.yml
diff --git a/roles/base/tasks/service_discovery.yml b/roles/float-base/tasks/service_discovery.yml
similarity index 100%
rename from roles/base/tasks/service_discovery.yml
rename to roles/float-base/tasks/service_discovery.yml
diff --git a/roles/base/tasks/ssh.yml b/roles/float-base/tasks/ssh.yml
similarity index 100%
rename from roles/base/tasks/ssh.yml
rename to roles/float-base/tasks/ssh.yml
diff --git a/roles/base/tasks/syslog.yml b/roles/float-base/tasks/syslog.yml
similarity index 100%
rename from roles/base/tasks/syslog.yml
rename to roles/float-base/tasks/syslog.yml
diff --git a/roles/base/templates/90proxy.j2 b/roles/float-base/templates/90proxy.j2
similarity index 100%
rename from roles/base/templates/90proxy.j2
rename to roles/float-base/templates/90proxy.j2
diff --git a/roles/base/templates/ansible.prom.j2 b/roles/float-base/templates/ansible.prom.j2
similarity index 100%
rename from roles/base/templates/ansible.prom.j2
rename to roles/float-base/templates/ansible.prom.j2
diff --git a/roles/base/templates/audit/auditd.conf.j2 b/roles/float-base/templates/audit/auditd.conf.j2
similarity index 100%
rename from roles/base/templates/audit/auditd.conf.j2
rename to roles/float-base/templates/audit/auditd.conf.j2
diff --git a/roles/base/templates/audit/rules.d/00base.rules.j2 b/roles/float-base/templates/audit/rules.d/00base.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/00base.rules.j2
rename to roles/float-base/templates/audit/rules.d/00base.rules.j2
diff --git a/roles/base/templates/audit/rules.d/01filters.rules.j2 b/roles/float-base/templates/audit/rules.d/01filters.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/01filters.rules.j2
rename to roles/float-base/templates/audit/rules.d/01filters.rules.j2
diff --git a/roles/base/templates/audit/rules.d/10audit.rules.j2 b/roles/float-base/templates/audit/rules.d/10audit.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/10audit.rules.j2
rename to roles/float-base/templates/audit/rules.d/10audit.rules.j2
diff --git a/roles/base/templates/audit/rules.d/10cron.rules.j2 b/roles/float-base/templates/audit/rules.d/10cron.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/10cron.rules.j2
rename to roles/float-base/templates/audit/rules.d/10cron.rules.j2
diff --git a/roles/base/templates/audit/rules.d/10privesc.rules.j2 b/roles/float-base/templates/audit/rules.d/10privesc.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/10privesc.rules.j2
rename to roles/float-base/templates/audit/rules.d/10privesc.rules.j2
diff --git a/roles/base/templates/audit/rules.d/10system.rules.j2 b/roles/float-base/templates/audit/rules.d/10system.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/10system.rules.j2
rename to roles/float-base/templates/audit/rules.d/10system.rules.j2
diff --git a/roles/base/templates/audit/rules.d/10user.rules.j2 b/roles/float-base/templates/audit/rules.d/10user.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/10user.rules.j2
rename to roles/float-base/templates/audit/rules.d/10user.rules.j2
diff --git a/roles/base/templates/audit/rules.d/20containers.rules.j2 b/roles/float-base/templates/audit/rules.d/20containers.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/20containers.rules.j2
rename to roles/float-base/templates/audit/rules.d/20containers.rules.j2
diff --git a/roles/base/templates/audit/rules.d/20suspicious.rules.j2 b/roles/float-base/templates/audit/rules.d/20suspicious.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/20suspicious.rules.j2
rename to roles/float-base/templates/audit/rules.d/20suspicious.rules.j2
diff --git a/roles/base/templates/audit/rules.d/99lockdown.rules.j2 b/roles/float-base/templates/audit/rules.d/99lockdown.rules.j2
similarity index 100%
rename from roles/base/templates/audit/rules.d/99lockdown.rules.j2
rename to roles/float-base/templates/audit/rules.d/99lockdown.rules.j2
diff --git a/roles/base/templates/firewall/10float.j2 b/roles/float-base/templates/firewall/10float.j2
similarity index 100%
rename from roles/base/templates/firewall/10float.j2
rename to roles/float-base/templates/firewall/10float.j2
diff --git a/roles/base/templates/hosts.j2 b/roles/float-base/templates/hosts.j2
similarity index 100%
rename from roles/base/templates/hosts.j2
rename to roles/float-base/templates/hosts.j2
diff --git a/roles/base/templates/jail.local.debian.j2 b/roles/float-base/templates/jail.local.debian.j2
similarity index 100%
rename from roles/base/templates/jail.local.debian.j2
rename to roles/float-base/templates/jail.local.debian.j2
diff --git a/roles/base/templates/osquery.conf.j2 b/roles/float-base/templates/osquery.conf.j2
similarity index 100%
rename from roles/base/templates/osquery.conf.j2
rename to roles/float-base/templates/osquery.conf.j2
diff --git a/roles/base/templates/profile.d/logcat.sh.j2 b/roles/float-base/templates/profile.d/logcat.sh.j2
similarity index 100%
rename from roles/base/templates/profile.d/logcat.sh.j2
rename to roles/float-base/templates/profile.d/logcat.sh.j2
diff --git a/roles/base/templates/resolv.conf.j2 b/roles/float-base/templates/resolv.conf.j2
similarity index 100%
rename from roles/base/templates/resolv.conf.j2
rename to roles/float-base/templates/resolv.conf.j2
diff --git a/roles/base/templates/roles.prom.j2 b/roles/float-base/templates/roles.prom.j2
similarity index 100%
rename from roles/base/templates/roles.prom.j2
rename to roles/float-base/templates/roles.prom.j2
diff --git a/roles/base/templates/rsyslog.conf.j2 b/roles/float-base/templates/rsyslog.conf.j2
similarity index 100%
rename from roles/base/templates/rsyslog.conf.j2
rename to roles/float-base/templates/rsyslog.conf.j2
diff --git a/roles/base/templates/sources.list.j2 b/roles/float-base/templates/sources.list.j2
similarity index 100%
rename from roles/base/templates/sources.list.j2
rename to roles/float-base/templates/sources.list.j2
diff --git a/roles/base/templates/ssh/ssh_config.j2 b/roles/float-base/templates/ssh/ssh_config.j2
similarity index 100%
rename from roles/base/templates/ssh/ssh_config.j2
rename to roles/float-base/templates/ssh/ssh_config.j2
diff --git a/roles/base/templates/ssh/ssh_known_hosts.j2 b/roles/float-base/templates/ssh/ssh_known_hosts.j2
similarity index 100%
rename from roles/base/templates/ssh/ssh_known_hosts.j2
rename to roles/float-base/templates/ssh/ssh_known_hosts.j2
diff --git a/roles/base/templates/ssh/sshd_config.j2 b/roles/float-base/templates/ssh/sshd_config.j2
similarity index 100%
rename from roles/base/templates/ssh/sshd_config.j2
rename to roles/float-base/templates/ssh/sshd_config.j2
diff --git a/roles/base/templates/ssmtp.conf.j2 b/roles/float-base/templates/ssmtp.conf.j2
similarity index 100%
rename from roles/base/templates/ssmtp.conf.j2
rename to roles/float-base/templates/ssmtp.conf.j2
diff --git a/roles/base/templates/sysctl.conf.j2 b/roles/float-base/templates/sysctl.conf.j2
similarity index 100%
rename from roles/base/templates/sysctl.conf.j2
rename to roles/float-base/templates/sysctl.conf.j2
diff --git a/roles/base/templates/tabacco/agent.yml.j2 b/roles/float-base/templates/tabacco/agent.yml.j2
similarity index 100%
rename from roles/base/templates/tabacco/agent.yml.j2
rename to roles/float-base/templates/tabacco/agent.yml.j2
diff --git a/roles/base/templates/tabacco/handlers/pipe.yml.j2 b/roles/float-base/templates/tabacco/handlers/pipe.yml.j2
similarity index 100%
rename from roles/base/templates/tabacco/handlers/pipe.yml.j2
rename to roles/float-base/templates/tabacco/handlers/pipe.yml.j2
diff --git a/roles/base/templates/tabacco/restore-script.j2 b/roles/float-base/templates/tabacco/restore-script.j2
similarity index 100%
rename from roles/base/templates/tabacco/restore-script.j2
rename to roles/float-base/templates/tabacco/restore-script.j2
diff --git a/roles/base/templates/tabacco/restore-service.j2 b/roles/float-base/templates/tabacco/restore-service.j2
similarity index 100%
rename from roles/base/templates/tabacco/restore-service.j2
rename to roles/float-base/templates/tabacco/restore-service.j2
diff --git a/roles/base/templates/tabacco/sources/source.yml.j2 b/roles/float-base/templates/tabacco/sources/source.yml.j2
similarity index 100%
rename from roles/base/templates/tabacco/sources/source.yml.j2
rename to roles/float-base/templates/tabacco/sources/source.yml.j2
diff --git a/roles/base/templates/vhostmap.prom.j2 b/roles/float-base/templates/vhostmap.prom.j2
similarity index 100%
rename from roles/base/templates/vhostmap.prom.j2
rename to roles/float-base/templates/vhostmap.prom.j2
diff --git a/roles/base/vars/main.yml b/roles/float-base/vars/main.yml
similarity index 100%
rename from roles/base/vars/main.yml
rename to roles/float-base/vars/main.yml
diff --git a/roles/acme-storage/README.md b/roles/float-infra-acme-storage/README.md
similarity index 100%
rename from roles/acme-storage/README.md
rename to roles/float-infra-acme-storage/README.md
diff --git a/roles/acme-storage/defaults/main.yml b/roles/float-infra-acme-storage/defaults/main.yml
similarity index 100%
rename from roles/acme-storage/defaults/main.yml
rename to roles/float-infra-acme-storage/defaults/main.yml
diff --git a/roles/acme-storage/files/acme-switch-certs b/roles/float-infra-acme-storage/files/acme-switch-certs
similarity index 100%
rename from roles/acme-storage/files/acme-switch-certs
rename to roles/float-infra-acme-storage/files/acme-switch-certs
diff --git a/roles/acme-storage/handlers/main.yml b/roles/float-infra-acme-storage/handlers/main.yml
similarity index 100%
rename from roles/acme-storage/handlers/main.yml
rename to roles/float-infra-acme-storage/handlers/main.yml
diff --git a/roles/acme-storage/tasks/main.yml b/roles/float-infra-acme-storage/tasks/main.yml
similarity index 100%
rename from roles/acme-storage/tasks/main.yml
rename to roles/float-infra-acme-storage/tasks/main.yml
diff --git a/roles/acme-storage/templates/replds.j2 b/roles/float-infra-acme-storage/templates/replds.j2
similarity index 100%
rename from roles/acme-storage/templates/replds.j2
rename to roles/float-infra-acme-storage/templates/replds.j2
diff --git a/roles/acme/README.md b/roles/float-infra-acme/README.md
similarity index 100%
rename from roles/acme/README.md
rename to roles/float-infra-acme/README.md
diff --git a/roles/acme/handlers/main.yml b/roles/float-infra-acme/handlers/main.yml
similarity index 100%
rename from roles/acme/handlers/main.yml
rename to roles/float-infra-acme/handlers/main.yml
diff --git a/roles/acme/tasks/main.yml b/roles/float-infra-acme/tasks/main.yml
similarity index 100%
rename from roles/acme/tasks/main.yml
rename to roles/float-infra-acme/tasks/main.yml
diff --git a/roles/acme/templates/certs.yml.j2 b/roles/float-infra-acme/templates/certs.yml.j2
similarity index 100%
rename from roles/acme/templates/certs.yml.j2
rename to roles/float-infra-acme/templates/certs.yml.j2
diff --git a/roles/acme/templates/config.yml.j2 b/roles/float-infra-acme/templates/config.yml.j2
similarity index 100%
rename from roles/acme/templates/config.yml.j2
rename to roles/float-infra-acme/templates/config.yml.j2
diff --git a/roles/admin-dashboard/handlers/main.yml b/roles/float-infra-admin-dashboard/handlers/main.yml
similarity index 100%
rename from roles/admin-dashboard/handlers/main.yml
rename to roles/float-infra-admin-dashboard/handlers/main.yml
diff --git a/roles/admin-dashboard/tasks/main.yml b/roles/float-infra-admin-dashboard/tasks/main.yml
similarity index 100%
rename from roles/admin-dashboard/tasks/main.yml
rename to roles/float-infra-admin-dashboard/tasks/main.yml
diff --git a/roles/admin-dashboard/templates/dashboard.yml.j2 b/roles/float-infra-admin-dashboard/templates/dashboard.yml.j2
similarity index 100%
rename from roles/admin-dashboard/templates/dashboard.yml.j2
rename to roles/float-infra-admin-dashboard/templates/dashboard.yml.j2
diff --git a/roles/auth-server/README.md b/roles/float-infra-auth-server/README.md
similarity index 100%
rename from roles/auth-server/README.md
rename to roles/float-infra-auth-server/README.md
diff --git a/roles/auth-server/defaults/main.yml b/roles/float-infra-auth-server/defaults/main.yml
similarity index 100%
rename from roles/auth-server/defaults/main.yml
rename to roles/float-infra-auth-server/defaults/main.yml
diff --git a/roles/auth-server/files/auth-server.default b/roles/float-infra-auth-server/files/auth-server.default
similarity index 100%
rename from roles/auth-server/files/auth-server.default
rename to roles/float-infra-auth-server/files/auth-server.default
diff --git a/roles/auth-server-users/handlers/main.yml b/roles/float-infra-auth-server/handlers/main.yml
similarity index 100%
rename from roles/auth-server-users/handlers/main.yml
rename to roles/float-infra-auth-server/handlers/main.yml
diff --git a/roles/auth-server/tasks/main.yml b/roles/float-infra-auth-server/tasks/main.yml
similarity index 100%
rename from roles/auth-server/tasks/main.yml
rename to roles/float-infra-auth-server/tasks/main.yml
diff --git a/roles/auth-server/templates/auth-server.yml.j2 b/roles/float-infra-auth-server/templates/auth-server.yml.j2
similarity index 100%
rename from roles/auth-server/templates/auth-server.yml.j2
rename to roles/float-infra-auth-server/templates/auth-server.yml.j2
diff --git a/roles/dns/README.md b/roles/float-infra-dns/README.md
similarity index 100%
rename from roles/dns/README.md
rename to roles/float-infra-dns/README.md
diff --git a/roles/dns/defaults/main.yml b/roles/float-infra-dns/defaults/main.yml
similarity index 100%
rename from roles/dns/defaults/main.yml
rename to roles/float-infra-dns/defaults/main.yml
diff --git a/roles/dns/handlers/main.yml b/roles/float-infra-dns/handlers/main.yml
similarity index 100%
rename from roles/dns/handlers/main.yml
rename to roles/float-infra-dns/handlers/main.yml
diff --git a/roles/dns/tasks/main.yml b/roles/float-infra-dns/tasks/main.yml
similarity index 100%
rename from roles/dns/tasks/main.yml
rename to roles/float-infra-dns/tasks/main.yml
diff --git a/roles/dns/templates/bind/named.conf b/roles/float-infra-dns/templates/bind/named.conf
similarity index 100%
rename from roles/dns/templates/bind/named.conf
rename to roles/float-infra-dns/templates/bind/named.conf
diff --git a/roles/dns/templates/bind/named.conf.local b/roles/float-infra-dns/templates/bind/named.conf.local
similarity index 100%
rename from roles/dns/templates/bind/named.conf.local
rename to roles/float-infra-dns/templates/bind/named.conf.local
diff --git a/roles/dns/templates/bind/named.conf.options b/roles/float-infra-dns/templates/bind/named.conf.options
similarity index 100%
rename from roles/dns/templates/bind/named.conf.options
rename to roles/float-infra-dns/templates/bind/named.conf.options
diff --git a/roles/dns/templates/dns/infra.yml b/roles/float-infra-dns/templates/dns/infra.yml
similarity index 100%
rename from roles/dns/templates/dns/infra.yml
rename to roles/float-infra-dns/templates/dns/infra.yml
diff --git a/roles/dns/templates/firewall/20dns.j2 b/roles/float-infra-dns/templates/firewall/20dns.j2
similarity index 100%
rename from roles/dns/templates/firewall/20dns.j2
rename to roles/float-infra-dns/templates/firewall/20dns.j2
diff --git a/roles/dns/templates/update-dns b/roles/float-infra-dns/templates/update-dns
similarity index 100%
rename from roles/dns/templates/update-dns
rename to roles/float-infra-dns/templates/update-dns
diff --git a/roles/dns/templates/zonetool.yml b/roles/float-infra-dns/templates/zonetool.yml
similarity index 100%
rename from roles/dns/templates/zonetool.yml
rename to roles/float-infra-dns/templates/zonetool.yml
diff --git a/roles/haproxy/handlers/main.yml b/roles/float-infra-haproxy/handlers/main.yml
similarity index 100%
rename from roles/haproxy/handlers/main.yml
rename to roles/float-infra-haproxy/handlers/main.yml
diff --git a/roles/haproxy/meta/main.yml b/roles/float-infra-haproxy/meta/main.yml
similarity index 59%
rename from roles/haproxy/meta/main.yml
rename to roles/float-infra-haproxy/meta/main.yml
index d572ea128825752b008a6158a457575311799d33..7c1d2964a4446b3acaefec7cabcb65994a612ca7 100644
--- a/roles/haproxy/meta/main.yml
+++ b/roles/float-infra-haproxy/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 
 dependencies:
-  - role: public-credentials
+  - role: float-base-public-credentials
     vars:
       credentials_type: tcp
 
diff --git a/roles/haproxy/tasks/haproxy.yml b/roles/float-infra-haproxy/tasks/haproxy.yml
similarity index 100%
rename from roles/haproxy/tasks/haproxy.yml
rename to roles/float-infra-haproxy/tasks/haproxy.yml
diff --git a/roles/haproxy/tasks/main.yml b/roles/float-infra-haproxy/tasks/main.yml
similarity index 100%
rename from roles/haproxy/tasks/main.yml
rename to roles/float-infra-haproxy/tasks/main.yml
diff --git a/roles/haproxy/templates/firewall/20haproxy.j2 b/roles/float-infra-haproxy/templates/firewall/20haproxy.j2
similarity index 100%
rename from roles/haproxy/templates/firewall/20haproxy.j2
rename to roles/float-infra-haproxy/templates/firewall/20haproxy.j2
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/float-infra-haproxy/templates/haproxy.cfg.j2
similarity index 100%
rename from roles/haproxy/templates/haproxy.cfg.j2
rename to roles/float-infra-haproxy/templates/haproxy.cfg.j2
diff --git a/roles/log-collector/README.md b/roles/float-infra-log-collector/README.md
similarity index 100%
rename from roles/log-collector/README.md
rename to roles/float-infra-log-collector/README.md
diff --git a/roles/log-collector/defaults/main.yml b/roles/float-infra-log-collector/defaults/main.yml
similarity index 100%
rename from roles/log-collector/defaults/main.yml
rename to roles/float-infra-log-collector/defaults/main.yml
diff --git a/roles/log-collector/files/es_init.py b/roles/float-infra-log-collector/files/es_init.py
similarity index 100%
rename from roles/log-collector/files/es_init.py
rename to roles/float-infra-log-collector/files/es_init.py
diff --git a/roles/log-collector/files/kibana/provisioning/audit_overview.json b/roles/float-infra-log-collector/files/kibana/provisioning/audit_overview.json
similarity index 100%
rename from roles/log-collector/files/kibana/provisioning/audit_overview.json
rename to roles/float-infra-log-collector/files/kibana/provisioning/audit_overview.json
diff --git a/roles/log-collector/files/kibana/provisioning/reports.json b/roles/float-infra-log-collector/files/kibana/provisioning/reports.json
similarity index 100%
rename from roles/log-collector/files/kibana/provisioning/reports.json
rename to roles/float-infra-log-collector/files/kibana/provisioning/reports.json
diff --git a/roles/log-collector/files/kibana/provisioning/syslog_overview.json b/roles/float-infra-log-collector/files/kibana/provisioning/syslog_overview.json
similarity index 100%
rename from roles/log-collector/files/kibana/provisioning/syslog_overview.json
rename to roles/float-infra-log-collector/files/kibana/provisioning/syslog_overview.json
diff --git a/roles/log-collector/files/kibana/provisioning/web_overview.json b/roles/float-infra-log-collector/files/kibana/provisioning/web_overview.json
similarity index 100%
rename from roles/log-collector/files/kibana/provisioning/web_overview.json
rename to roles/float-infra-log-collector/files/kibana/provisioning/web_overview.json
diff --git a/roles/log-collector/files/kibana_importer.py b/roles/float-infra-log-collector/files/kibana_importer.py
similarity index 100%
rename from roles/log-collector/files/kibana_importer.py
rename to roles/float-infra-log-collector/files/kibana_importer.py
diff --git a/roles/log-collector/files/lognorm/audit.rb b/roles/float-infra-log-collector/files/lognorm/audit.rb
similarity index 100%
rename from roles/log-collector/files/lognorm/audit.rb
rename to roles/float-infra-log-collector/files/lognorm/audit.rb
diff --git a/roles/log-collector/files/lognorm/auth.rb b/roles/float-infra-log-collector/files/lognorm/auth.rb
similarity index 100%
rename from roles/log-collector/files/lognorm/auth.rb
rename to roles/float-infra-log-collector/files/lognorm/auth.rb
diff --git a/roles/log-collector/files/lognorm/http.rb b/roles/float-infra-log-collector/files/lognorm/http.rb
similarity index 100%
rename from roles/log-collector/files/lognorm/http.rb
rename to roles/float-infra-log-collector/files/lognorm/http.rb
diff --git a/roles/log-collector/files/lognorm/postfix.rb b/roles/float-infra-log-collector/files/lognorm/postfix.rb
similarity index 100%
rename from roles/log-collector/files/lognorm/postfix.rb
rename to roles/float-infra-log-collector/files/lognorm/postfix.rb
diff --git a/roles/log-collector/handlers/main.yml b/roles/float-infra-log-collector/handlers/main.yml
similarity index 100%
rename from roles/log-collector/handlers/main.yml
rename to roles/float-infra-log-collector/handlers/main.yml
diff --git a/roles/log-collector/tasks/elasticsearch.yml b/roles/float-infra-log-collector/tasks/elasticsearch.yml
similarity index 100%
rename from roles/log-collector/tasks/elasticsearch.yml
rename to roles/float-infra-log-collector/tasks/elasticsearch.yml
diff --git a/roles/log-collector/tasks/main.yml b/roles/float-infra-log-collector/tasks/main.yml
similarity index 100%
rename from roles/log-collector/tasks/main.yml
rename to roles/float-infra-log-collector/tasks/main.yml
diff --git a/roles/log-collector/templates/elasticsearch/actions/maint.yml.j2 b/roles/float-infra-log-collector/templates/elasticsearch/actions/maint.yml.j2
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/actions/maint.yml.j2
rename to roles/float-infra-log-collector/templates/elasticsearch/actions/maint.yml.j2
diff --git a/roles/log-collector/templates/elasticsearch/curator.yml b/roles/float-infra-log-collector/templates/elasticsearch/curator.yml
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/curator.yml
rename to roles/float-infra-log-collector/templates/elasticsearch/curator.yml
diff --git a/roles/log-collector/templates/elasticsearch/elasticsearch.yml b/roles/float-infra-log-collector/templates/elasticsearch/elasticsearch.yml
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/elasticsearch.yml
rename to roles/float-infra-log-collector/templates/elasticsearch/elasticsearch.yml
diff --git a/roles/log-collector/templates/elasticsearch/jvm.options b/roles/float-infra-log-collector/templates/elasticsearch/jvm.options
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/jvm.options
rename to roles/float-infra-log-collector/templates/elasticsearch/jvm.options
diff --git a/roles/log-collector/templates/elasticsearch/log4j2.properties b/roles/float-infra-log-collector/templates/elasticsearch/log4j2.properties
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/log4j2.properties
rename to roles/float-infra-log-collector/templates/elasticsearch/log4j2.properties
diff --git a/roles/log-collector/templates/elasticsearch/templates/audit.json b/roles/float-infra-log-collector/templates/elasticsearch/templates/audit.json
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/templates/audit.json
rename to roles/float-infra-log-collector/templates/elasticsearch/templates/audit.json
diff --git a/roles/log-collector/templates/elasticsearch/templates/http.json b/roles/float-infra-log-collector/templates/elasticsearch/templates/http.json
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/templates/http.json
rename to roles/float-infra-log-collector/templates/elasticsearch/templates/http.json
diff --git a/roles/log-collector/templates/elasticsearch/templates/logs.json b/roles/float-infra-log-collector/templates/elasticsearch/templates/logs.json
similarity index 100%
rename from roles/log-collector/templates/elasticsearch/templates/logs.json
rename to roles/float-infra-log-collector/templates/elasticsearch/templates/logs.json
diff --git a/roles/log-collector/templates/kibana/kibana.yml b/roles/float-infra-log-collector/templates/kibana/kibana.yml
similarity index 100%
rename from roles/log-collector/templates/kibana/kibana.yml
rename to roles/float-infra-log-collector/templates/kibana/kibana.yml
diff --git a/roles/log-collector/templates/log-collector.logrotate.j2 b/roles/float-infra-log-collector/templates/log-collector.logrotate.j2
similarity index 100%
rename from roles/log-collector/templates/log-collector.logrotate.j2
rename to roles/float-infra-log-collector/templates/log-collector.logrotate.j2
diff --git a/roles/log-collector/templates/rsyslog-collector.conf.j2 b/roles/float-infra-log-collector/templates/rsyslog-collector.conf.j2
similarity index 100%
rename from roles/log-collector/templates/rsyslog-collector.conf.j2
rename to roles/float-infra-log-collector/templates/rsyslog-collector.conf.j2
diff --git a/roles/nginx/README.md b/roles/float-infra-nginx/README.md
similarity index 100%
rename from roles/nginx/README.md
rename to roles/float-infra-nginx/README.md
diff --git a/roles/nginx/defaults/main.yml b/roles/float-infra-nginx/defaults/main.yml
similarity index 100%
rename from roles/nginx/defaults/main.yml
rename to roles/float-infra-nginx/defaults/main.yml
diff --git a/roles/nginx/files/acme-reload-nginx b/roles/float-infra-nginx/files/acme-reload-nginx
similarity index 100%
rename from roles/nginx/files/acme-reload-nginx
rename to roles/float-infra-nginx/files/acme-reload-nginx
diff --git a/roles/nginx/files/acme-reload-nginx.cron b/roles/float-infra-nginx/files/acme-reload-nginx.cron
similarity index 100%
rename from roles/nginx/files/acme-reload-nginx.cron
rename to roles/float-infra-nginx/files/acme-reload-nginx.cron
diff --git a/roles/nginx/files/errors/429.html b/roles/float-infra-nginx/files/errors/429.html
similarity index 100%
rename from roles/nginx/files/errors/429.html
rename to roles/float-infra-nginx/files/errors/429.html
diff --git a/roles/nginx/files/errors/451.html b/roles/float-infra-nginx/files/errors/451.html
similarity index 100%
rename from roles/nginx/files/errors/451.html
rename to roles/float-infra-nginx/files/errors/451.html
diff --git a/roles/nginx/files/errors/500.html b/roles/float-infra-nginx/files/errors/500.html
similarity index 100%
rename from roles/nginx/files/errors/500.html
rename to roles/float-infra-nginx/files/errors/500.html
diff --git a/roles/nginx/files/errors/502.html b/roles/float-infra-nginx/files/errors/502.html
similarity index 100%
rename from roles/nginx/files/errors/502.html
rename to roles/float-infra-nginx/files/errors/502.html
diff --git a/roles/nginx/files/errors/503.html b/roles/float-infra-nginx/files/errors/503.html
similarity index 100%
rename from roles/nginx/files/errors/503.html
rename to roles/float-infra-nginx/files/errors/503.html
diff --git a/roles/nginx/files/errors/504.html b/roles/float-infra-nginx/files/errors/504.html
similarity index 100%
rename from roles/nginx/files/errors/504.html
rename to roles/float-infra-nginx/files/errors/504.html
diff --git a/roles/nginx/files/errors/Rstar22-t.png b/roles/float-infra-nginx/files/errors/Rstar22-t.png
similarity index 100%
rename from roles/nginx/files/errors/Rstar22-t.png
rename to roles/float-infra-nginx/files/errors/Rstar22-t.png
diff --git a/roles/nginx/files/errors/bomb-small-c.png b/roles/float-infra-nginx/files/errors/bomb-small-c.png
similarity index 100%
rename from roles/nginx/files/errors/bomb-small-c.png
rename to roles/float-infra-nginx/files/errors/bomb-small-c.png
diff --git a/roles/nginx/files/favicon.ico b/roles/float-infra-nginx/files/favicon.ico
similarity index 100%
rename from roles/nginx/files/favicon.ico
rename to roles/float-infra-nginx/files/favicon.ico
diff --git a/roles/nginx/files/nginx.logrotate b/roles/float-infra-nginx/files/nginx.logrotate
similarity index 100%
rename from roles/nginx/files/nginx.logrotate
rename to roles/float-infra-nginx/files/nginx.logrotate
diff --git a/roles/nginx/files/nginx.service b/roles/float-infra-nginx/files/nginx.service
similarity index 100%
rename from roles/nginx/files/nginx.service
rename to roles/float-infra-nginx/files/nginx.service
diff --git a/roles/nginx/files/sso-proxy.default b/roles/float-infra-nginx/files/sso-proxy.default
similarity index 100%
rename from roles/nginx/files/sso-proxy.default
rename to roles/float-infra-nginx/files/sso-proxy.default
diff --git a/roles/nginx/handlers/main.yml b/roles/float-infra-nginx/handlers/main.yml
similarity index 100%
rename from roles/nginx/handlers/main.yml
rename to roles/float-infra-nginx/handlers/main.yml
diff --git a/roles/nginx/meta/main.yml b/roles/float-infra-nginx/meta/main.yml
similarity index 59%
rename from roles/nginx/meta/main.yml
rename to roles/float-infra-nginx/meta/main.yml
index 02182fa2ec07a30c6138621c6c4b6597185853f0..e57ebd74bb839ff14504756f855da5f74eacfb79 100644
--- a/roles/nginx/meta/main.yml
+++ b/roles/float-infra-nginx/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 
 dependencies:
-  - role: public-credentials
+  - role: float-base-public-credentials
     vars:
       credentials_type: http
 
diff --git a/roles/nginx/tasks/main.yml b/roles/float-infra-nginx/tasks/main.yml
similarity index 100%
rename from roles/nginx/tasks/main.yml
rename to roles/float-infra-nginx/tasks/main.yml
diff --git a/roles/nginx/tasks/nginx.yml b/roles/float-infra-nginx/tasks/nginx.yml
similarity index 100%
rename from roles/nginx/tasks/nginx.yml
rename to roles/float-infra-nginx/tasks/nginx.yml
diff --git a/roles/nginx/templates/config/block/url/README.md b/roles/float-infra-nginx/templates/config/block/url/README.md
similarity index 100%
rename from roles/nginx/templates/config/block/url/README.md
rename to roles/float-infra-nginx/templates/config/block/url/README.md
diff --git a/roles/nginx/templates/config/block/useragent/README.md b/roles/float-infra-nginx/templates/config/block/useragent/README.md
similarity index 100%
rename from roles/nginx/templates/config/block/useragent/README.md
rename to roles/float-infra-nginx/templates/config/block/useragent/README.md
diff --git a/roles/nginx/templates/config/block/useragent/seo.conf b/roles/float-infra-nginx/templates/config/block/useragent/seo.conf
similarity index 100%
rename from roles/nginx/templates/config/block/useragent/seo.conf
rename to roles/float-infra-nginx/templates/config/block/useragent/seo.conf
diff --git a/roles/nginx/templates/config/conf.d/block.conf b/roles/float-infra-nginx/templates/config/conf.d/block.conf
similarity index 100%
rename from roles/nginx/templates/config/conf.d/block.conf
rename to roles/float-infra-nginx/templates/config/conf.d/block.conf
diff --git a/roles/nginx/templates/config/conf.d/gzip.conf b/roles/float-infra-nginx/templates/config/conf.d/gzip.conf
similarity index 100%
rename from roles/nginx/templates/config/conf.d/gzip.conf
rename to roles/float-infra-nginx/templates/config/conf.d/gzip.conf
diff --git a/roles/nginx/templates/config/conf.d/limits.conf b/roles/float-infra-nginx/templates/config/conf.d/limits.conf
similarity index 100%
rename from roles/nginx/templates/config/conf.d/limits.conf
rename to roles/float-infra-nginx/templates/config/conf.d/limits.conf
diff --git a/roles/nginx/templates/config/conf.d/proxy.conf b/roles/float-infra-nginx/templates/config/conf.d/proxy.conf
similarity index 100%
rename from roles/nginx/templates/config/conf.d/proxy.conf
rename to roles/float-infra-nginx/templates/config/conf.d/proxy.conf
diff --git a/roles/nginx/templates/config/conf.d/ssl.conf b/roles/float-infra-nginx/templates/config/conf.d/ssl.conf
similarity index 100%
rename from roles/nginx/templates/config/conf.d/ssl.conf
rename to roles/float-infra-nginx/templates/config/conf.d/ssl.conf
diff --git a/roles/nginx/templates/config/nginx.conf b/roles/float-infra-nginx/templates/config/nginx.conf
similarity index 100%
rename from roles/nginx/templates/config/nginx.conf
rename to roles/float-infra-nginx/templates/config/nginx.conf
diff --git a/roles/nginx/templates/config/sites-available/default b/roles/float-infra-nginx/templates/config/sites-available/default
similarity index 100%
rename from roles/nginx/templates/config/sites-available/default
rename to roles/float-infra-nginx/templates/config/sites-available/default
diff --git a/roles/nginx/templates/config/snippets/block.conf b/roles/float-infra-nginx/templates/config/snippets/block.conf
similarity index 100%
rename from roles/nginx/templates/config/snippets/block.conf
rename to roles/float-infra-nginx/templates/config/snippets/block.conf
diff --git a/roles/nginx/templates/config/snippets/proxy-ssl.conf b/roles/float-infra-nginx/templates/config/snippets/proxy-ssl.conf
similarity index 100%
rename from roles/nginx/templates/config/snippets/proxy-ssl.conf
rename to roles/float-infra-nginx/templates/config/snippets/proxy-ssl.conf
diff --git a/roles/nginx/templates/config/snippets/proxy.conf b/roles/float-infra-nginx/templates/config/snippets/proxy.conf
similarity index 100%
rename from roles/nginx/templates/config/snippets/proxy.conf
rename to roles/float-infra-nginx/templates/config/snippets/proxy.conf
diff --git a/roles/nginx/templates/config/snippets/site-common.conf b/roles/float-infra-nginx/templates/config/snippets/site-common.conf
similarity index 100%
rename from roles/nginx/templates/config/snippets/site-common.conf
rename to roles/float-infra-nginx/templates/config/snippets/site-common.conf
diff --git a/roles/nginx/templates/firewall/20nginx.j2 b/roles/float-infra-nginx/templates/firewall/20nginx.j2
similarity index 100%
rename from roles/nginx/templates/firewall/20nginx.j2
rename to roles/float-infra-nginx/templates/firewall/20nginx.j2
diff --git a/roles/nginx/templates/index.html.j2 b/roles/float-infra-nginx/templates/index.html.j2
similarity index 100%
rename from roles/nginx/templates/index.html.j2
rename to roles/float-infra-nginx/templates/index.html.j2
diff --git a/roles/nginx/templates/nginx-upstream.j2 b/roles/float-infra-nginx/templates/nginx-upstream.j2
similarity index 100%
rename from roles/nginx/templates/nginx-upstream.j2
rename to roles/float-infra-nginx/templates/nginx-upstream.j2
diff --git a/roles/nginx/templates/nginx-vhost.j2 b/roles/float-infra-nginx/templates/nginx-vhost.j2
similarity index 100%
rename from roles/nginx/templates/nginx-vhost.j2
rename to roles/float-infra-nginx/templates/nginx-vhost.j2
diff --git a/roles/nginx/templates/nginx.mtail.j2 b/roles/float-infra-nginx/templates/nginx.mtail.j2
similarity index 100%
rename from roles/nginx/templates/nginx.mtail.j2
rename to roles/float-infra-nginx/templates/nginx.mtail.j2
diff --git a/roles/nginx/templates/proxy.yml.j2 b/roles/float-infra-nginx/templates/proxy.yml.j2
similarity index 100%
rename from roles/nginx/templates/proxy.yml.j2
rename to roles/float-infra-nginx/templates/proxy.yml.j2
diff --git a/roles/prometheus-lts/defaults/main.yml b/roles/float-infra-prometheus-lts/defaults/main.yml
similarity index 100%
rename from roles/prometheus-lts/defaults/main.yml
rename to roles/float-infra-prometheus-lts/defaults/main.yml
diff --git a/roles/prometheus-lts/handlers/main.yml b/roles/float-infra-prometheus-lts/handlers/main.yml
similarity index 100%
rename from roles/prometheus-lts/handlers/main.yml
rename to roles/float-infra-prometheus-lts/handlers/main.yml
diff --git a/roles/prometheus-lts/tasks/main.yml b/roles/float-infra-prometheus-lts/tasks/main.yml
similarity index 100%
rename from roles/prometheus-lts/tasks/main.yml
rename to roles/float-infra-prometheus-lts/tasks/main.yml
diff --git a/roles/prometheus-lts/templates/prometheus.yml.j2 b/roles/float-infra-prometheus-lts/templates/prometheus.yml.j2
similarity index 100%
rename from roles/prometheus-lts/templates/prometheus.yml.j2
rename to roles/float-infra-prometheus-lts/templates/prometheus.yml.j2
diff --git a/roles/prometheus/README.md b/roles/float-infra-prometheus/README.md
similarity index 100%
rename from roles/prometheus/README.md
rename to roles/float-infra-prometheus/README.md
diff --git a/roles/prometheus/defaults/main.yml b/roles/float-infra-prometheus/defaults/main.yml
similarity index 100%
rename from roles/prometheus/defaults/main.yml
rename to roles/float-infra-prometheus/defaults/main.yml
diff --git a/roles/prometheus/handlers/main.yml b/roles/float-infra-prometheus/handlers/main.yml
similarity index 100%
rename from roles/prometheus/handlers/main.yml
rename to roles/float-infra-prometheus/handlers/main.yml
diff --git a/roles/prometheus/tasks/cleanup.yml b/roles/float-infra-prometheus/tasks/cleanup.yml
similarity index 100%
rename from roles/prometheus/tasks/cleanup.yml
rename to roles/float-infra-prometheus/tasks/cleanup.yml
diff --git a/roles/prometheus/tasks/grafana.yml b/roles/float-infra-prometheus/tasks/grafana.yml
similarity index 100%
rename from roles/prometheus/tasks/grafana.yml
rename to roles/float-infra-prometheus/tasks/grafana.yml
diff --git a/roles/prometheus/tasks/main.yml b/roles/float-infra-prometheus/tasks/main.yml
similarity index 100%
rename from roles/prometheus/tasks/main.yml
rename to roles/float-infra-prometheus/tasks/main.yml
diff --git a/roles/prometheus/tasks/prometheus.yml b/roles/float-infra-prometheus/tasks/prometheus.yml
similarity index 100%
rename from roles/prometheus/tasks/prometheus.yml
rename to roles/float-infra-prometheus/tasks/prometheus.yml
diff --git a/roles/prometheus/templates/alertmanager.yml.j2 b/roles/float-infra-prometheus/templates/alertmanager.yml.j2
similarity index 100%
rename from roles/prometheus/templates/alertmanager.yml.j2
rename to roles/float-infra-prometheus/templates/alertmanager.yml.j2
diff --git a/roles/prometheus/templates/alertmanager_templates/email.tmpl b/roles/float-infra-prometheus/templates/alertmanager_templates/email.tmpl
similarity index 100%
rename from roles/prometheus/templates/alertmanager_templates/email.tmpl
rename to roles/float-infra-prometheus/templates/alertmanager_templates/email.tmpl
diff --git a/roles/prometheus/templates/blackbox.yml.j2 b/roles/float-infra-prometheus/templates/blackbox.yml.j2
similarity index 100%
rename from roles/prometheus/templates/blackbox.yml.j2
rename to roles/float-infra-prometheus/templates/blackbox.yml.j2
diff --git a/roles/prometheus/templates/grafana/dashboards/apache.json b/roles/float-infra-prometheus/templates/grafana/dashboards/apache.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/apache.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/apache.json
diff --git a/roles/prometheus/templates/grafana/dashboards/elasticsearch.json b/roles/float-infra-prometheus/templates/grafana/dashboards/elasticsearch.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/elasticsearch.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/elasticsearch.json
diff --git a/roles/prometheus/templates/grafana/dashboards/go.json b/roles/float-infra-prometheus/templates/grafana/dashboards/go.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/go.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/go.json
diff --git a/roles/prometheus/templates/grafana/dashboards/host.json b/roles/float-infra-prometheus/templates/grafana/dashboards/host.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/host.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/host.json
diff --git a/roles/prometheus/templates/grafana/dashboards/http.json b/roles/float-infra-prometheus/templates/grafana/dashboards/http.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/http.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/http.json
diff --git a/roles/prometheus/templates/grafana/dashboards/network.json b/roles/float-infra-prometheus/templates/grafana/dashboards/network.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/network.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/network.json
diff --git a/roles/prometheus/templates/grafana/dashboards/prometheus.json b/roles/float-infra-prometheus/templates/grafana/dashboards/prometheus.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/prometheus.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/prometheus.json
diff --git a/roles/prometheus/templates/grafana/dashboards/service.json b/roles/float-infra-prometheus/templates/grafana/dashboards/service.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/service.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/service.json
diff --git a/roles/prometheus/templates/grafana/dashboards/service_overview.json b/roles/float-infra-prometheus/templates/grafana/dashboards/service_overview.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/service_overview.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/service_overview.json
diff --git a/roles/prometheus/templates/grafana/dashboards/syslog.json b/roles/float-infra-prometheus/templates/grafana/dashboards/syslog.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/syslog.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/syslog.json
diff --git a/roles/prometheus/templates/grafana/dashboards/system_overview.json b/roles/float-infra-prometheus/templates/grafana/dashboards/system_overview.json
similarity index 100%
rename from roles/prometheus/templates/grafana/dashboards/system_overview.json
rename to roles/float-infra-prometheus/templates/grafana/dashboards/system_overview.json
diff --git a/roles/prometheus/templates/grafana/grafana.ini b/roles/float-infra-prometheus/templates/grafana/grafana.ini
similarity index 100%
rename from roles/prometheus/templates/grafana/grafana.ini
rename to roles/float-infra-prometheus/templates/grafana/grafana.ini
diff --git a/roles/prometheus/templates/grafana/provisioning/dashboards/default.yml b/roles/float-infra-prometheus/templates/grafana/provisioning/dashboards/default.yml
similarity index 100%
rename from roles/prometheus/templates/grafana/provisioning/dashboards/default.yml
rename to roles/float-infra-prometheus/templates/grafana/provisioning/dashboards/default.yml
diff --git a/roles/prometheus/templates/grafana/provisioning/datasources/default.yml b/roles/float-infra-prometheus/templates/grafana/provisioning/datasources/default.yml
similarity index 100%
rename from roles/prometheus/templates/grafana/provisioning/datasources/default.yml
rename to roles/float-infra-prometheus/templates/grafana/provisioning/datasources/default.yml
diff --git a/roles/prometheus/templates/karma.yml.j2 b/roles/float-infra-prometheus/templates/karma.yml.j2
similarity index 100%
rename from roles/prometheus/templates/karma.yml.j2
rename to roles/float-infra-prometheus/templates/karma.yml.j2
diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/float-infra-prometheus/templates/prometheus.yml.j2
similarity index 100%
rename from roles/prometheus/templates/prometheus.yml.j2
rename to roles/float-infra-prometheus/templates/prometheus.yml.j2
diff --git a/roles/prometheus/templates/query-frontend-cache.yml.j2 b/roles/float-infra-prometheus/templates/query-frontend-cache.yml.j2
similarity index 100%
rename from roles/prometheus/templates/query-frontend-cache.yml.j2
rename to roles/float-infra-prometheus/templates/query-frontend-cache.yml.j2
diff --git a/roles/prometheus/templates/rules/alerts_acme.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_acme.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_acme.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_acme.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_backup.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_backup.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_backup.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_backup.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_base.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_base.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_base.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_base.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_cpu.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_cpu.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_cpu.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_cpu.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_disk.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_disk.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_disk.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_disk.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_mtail.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_mtail.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_mtail.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_mtail.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_mysql.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_mysql.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_mysql.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_mysql.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_net.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_net.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_net.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_net.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_nginx.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_nginx.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_nginx.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_nginx.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_prometheus.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_prometheus.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_prometheus.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_prometheus.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_services.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_services.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_services.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_services.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_ssl_probes.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_ssl_probes.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_ssl_probes.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_ssl_probes.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_syslog.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_syslog.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_syslog.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_syslog.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_system_health.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_system_health.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_system_health.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_system_health.conf.yml
diff --git a/roles/prometheus/templates/rules/alerts_systemd.conf.yml b/roles/float-infra-prometheus/templates/rules/alerts_systemd.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/alerts_systemd.conf.yml
rename to roles/float-infra-prometheus/templates/rules/alerts_systemd.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_acme.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_acme.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_acme.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_acme.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_base.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_base.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_base.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_base.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_cpu.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_cpu.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_cpu.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_cpu.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_disk.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_disk.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_disk.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_elasticsearch.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_elasticsearch.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_elasticsearch.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_elasticsearch.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_mysql.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_mysql.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_mysql.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_mysql.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_net.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_net.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_net.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_net.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_nginx.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_nginx.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_nginx.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_nginx.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_node_016.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_node_016.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_node_016.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_node_016.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_services.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_services.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_services.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_services.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_ssl_probes.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_ssl_probes.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_ssl_probes.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_ssl_probes.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_syslog.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_syslog.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_syslog.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_syslog.conf.yml
diff --git a/roles/prometheus/templates/rules/rules_systemd.conf.yml b/roles/float-infra-prometheus/templates/rules/rules_systemd.conf.yml
similarity index 100%
rename from roles/prometheus/templates/rules/rules_systemd.conf.yml
rename to roles/float-infra-prometheus/templates/rules/rules_systemd.conf.yml
diff --git a/roles/reports-collector/meta/main.yml b/roles/float-infra-reports-collector/meta/main.yml
similarity index 61%
rename from roles/reports-collector/meta/main.yml
rename to roles/float-infra-reports-collector/meta/main.yml
index a7a45080b25eae3c68f268d685fbddab911d63ac..928a6a14d61a25cd145cf9131015d97d930b5c2c 100644
--- a/roles/reports-collector/meta/main.yml
+++ b/roles/float-infra-reports-collector/meta/main.yml
@@ -1,5 +1,5 @@
 ---
 dependencies:
-  - role: geoip-dataset
+  - role: float-util-geoip-dataset
     vars:
       geoip_dataset: 'ASN'
diff --git a/roles/sso-server/README.md b/roles/float-infra-sso-server/README.md
similarity index 100%
rename from roles/sso-server/README.md
rename to roles/float-infra-sso-server/README.md
diff --git a/roles/sso-server/defaults/main.yml b/roles/float-infra-sso-server/defaults/main.yml
similarity index 100%
rename from roles/sso-server/defaults/main.yml
rename to roles/float-infra-sso-server/defaults/main.yml
diff --git a/roles/sso-server/files/sso.service.yml b/roles/float-infra-sso-server/files/sso.service.yml
similarity index 100%
rename from roles/sso-server/files/sso.service.yml
rename to roles/float-infra-sso-server/files/sso.service.yml
diff --git a/roles/sso-server/handlers/main.yml b/roles/float-infra-sso-server/handlers/main.yml
similarity index 100%
rename from roles/sso-server/handlers/main.yml
rename to roles/float-infra-sso-server/handlers/main.yml
diff --git a/roles/float-infra-sso-server/meta/main.yml b/roles/float-infra-sso-server/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d13e3919dc058c4a790c6d6c05eb147227aa63bb
--- /dev/null
+++ b/roles/float-infra-sso-server/meta/main.yml
@@ -0,0 +1,7 @@
+---
+dependencies:
+  - role: float-infra-auth-server
+  - role: float-util-auth-server-users
+  - role: float-util-geoip-dataset
+    vars:
+      geoip_dataset: 'Country'
diff --git a/roles/sso-server/tasks/main.yml b/roles/float-infra-sso-server/tasks/main.yml
similarity index 100%
rename from roles/sso-server/tasks/main.yml
rename to roles/float-infra-sso-server/tasks/main.yml
diff --git a/roles/sso-server/tasks/sso-server.yml b/roles/float-infra-sso-server/tasks/sso-server.yml
similarity index 100%
rename from roles/sso-server/tasks/sso-server.yml
rename to roles/float-infra-sso-server/tasks/sso-server.yml
diff --git a/roles/sso-server/tasks/user-meta-server.yml b/roles/float-infra-sso-server/tasks/user-meta-server.yml
similarity index 100%
rename from roles/sso-server/tasks/user-meta-server.yml
rename to roles/float-infra-sso-server/tasks/user-meta-server.yml
diff --git a/roles/sso-server/templates/server.yml.j2 b/roles/float-infra-sso-server/templates/server.yml.j2
similarity index 100%
rename from roles/sso-server/templates/server.yml.j2
rename to roles/float-infra-sso-server/templates/server.yml.j2
diff --git a/roles/sso-server/templates/user-meta-server.yml.j2 b/roles/float-infra-sso-server/templates/user-meta-server.yml.j2
similarity index 100%
rename from roles/sso-server/templates/user-meta-server.yml.j2
rename to roles/float-infra-sso-server/templates/user-meta-server.yml.j2
diff --git a/roles/thanos-query-lts/tasks/main.yml b/roles/float-infra-thanos-query-lts/tasks/main.yml
similarity index 100%
rename from roles/thanos-query-lts/tasks/main.yml
rename to roles/float-infra-thanos-query-lts/tasks/main.yml
diff --git a/roles/thanos-query-lts/templates/prometheus-lts.yml.j2 b/roles/float-infra-thanos-query-lts/templates/prometheus-lts.yml.j2
similarity index 100%
rename from roles/thanos-query-lts/templates/prometheus-lts.yml.j2
rename to roles/float-infra-thanos-query-lts/templates/prometheus-lts.yml.j2
diff --git a/roles/auth-server-users/README.md b/roles/float-util-auth-server-users/README.md
similarity index 100%
rename from roles/auth-server-users/README.md
rename to roles/float-util-auth-server-users/README.md
diff --git a/roles/auth-server/handlers/main.yml b/roles/float-util-auth-server-users/handlers/main.yml
similarity index 100%
rename from roles/auth-server/handlers/main.yml
rename to roles/float-util-auth-server-users/handlers/main.yml
diff --git a/roles/auth-server-users/tasks/main.yml b/roles/float-util-auth-server-users/tasks/main.yml
similarity index 100%
rename from roles/auth-server-users/tasks/main.yml
rename to roles/float-util-auth-server-users/tasks/main.yml
diff --git a/roles/auth-server-users/templates/users.yml.j2 b/roles/float-util-auth-server-users/templates/users.yml.j2
similarity index 100%
rename from roles/auth-server-users/templates/users.yml.j2
rename to roles/float-util-auth-server-users/templates/users.yml.j2
diff --git a/roles/batch/README.md b/roles/float-util-batch/README.md
similarity index 100%
rename from roles/batch/README.md
rename to roles/float-util-batch/README.md
diff --git a/roles/batch/tasks/main.yml b/roles/float-util-batch/tasks/main.yml
similarity index 100%
rename from roles/batch/tasks/main.yml
rename to roles/float-util-batch/tasks/main.yml
diff --git a/roles/batch/templates/wrapper.j2 b/roles/float-util-batch/templates/wrapper.j2
similarity index 100%
rename from roles/batch/templates/wrapper.j2
rename to roles/float-util-batch/templates/wrapper.j2
diff --git a/roles/credentials/README.md b/roles/float-util-credentials/README.md
similarity index 100%
rename from roles/credentials/README.md
rename to roles/float-util-credentials/README.md
diff --git a/roles/credentials/tasks/main.yml b/roles/float-util-credentials/tasks/main.yml
similarity index 100%
rename from roles/credentials/tasks/main.yml
rename to roles/float-util-credentials/tasks/main.yml
diff --git a/roles/geoip-base/README.md b/roles/float-util-geoip-base/README.md
similarity index 100%
rename from roles/geoip-base/README.md
rename to roles/float-util-geoip-base/README.md
diff --git a/roles/geoip-base/tasks/main.yml b/roles/float-util-geoip-base/tasks/main.yml
similarity index 100%
rename from roles/geoip-base/tasks/main.yml
rename to roles/float-util-geoip-base/tasks/main.yml
diff --git a/roles/geoip-dataset/README.md b/roles/float-util-geoip-dataset/README.md
similarity index 100%
rename from roles/geoip-dataset/README.md
rename to roles/float-util-geoip-dataset/README.md
diff --git a/roles/geoip-dataset/handlers/main.yml b/roles/float-util-geoip-dataset/handlers/main.yml
similarity index 100%
rename from roles/geoip-dataset/handlers/main.yml
rename to roles/float-util-geoip-dataset/handlers/main.yml
diff --git a/roles/geoip-dataset/meta/main.yml b/roles/float-util-geoip-dataset/meta/main.yml
similarity index 53%
rename from roles/geoip-dataset/meta/main.yml
rename to roles/float-util-geoip-dataset/meta/main.yml
index b6bcc1651c4931558cbc92ccfe7e91b53d16115c..c9dc0ef42b162cc57259f02489336782675f36a6 100644
--- a/roles/geoip-dataset/meta/main.yml
+++ b/roles/float-util-geoip-dataset/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 allow_duplicates: true
 dependencies:
-  - { role: geoip-base }
+  - { role: float-util-geoip-base }
diff --git a/roles/geoip-dataset/tasks/main.yml b/roles/float-util-geoip-dataset/tasks/main.yml
similarity index 100%
rename from roles/geoip-dataset/tasks/main.yml
rename to roles/float-util-geoip-dataset/tasks/main.yml
diff --git a/roles/geoip-dataset/templates/GeoIP.conf.j2 b/roles/float-util-geoip-dataset/templates/GeoIP.conf.j2
similarity index 100%
rename from roles/geoip-dataset/templates/GeoIP.conf.j2
rename to roles/float-util-geoip-dataset/templates/GeoIP.conf.j2
diff --git a/roles/mariadb/defaults/main.yml b/roles/float-util-mariadb/defaults/main.yml
similarity index 100%
rename from roles/mariadb/defaults/main.yml
rename to roles/float-util-mariadb/defaults/main.yml
diff --git a/roles/mariadb/files/mariadb-replicator b/roles/float-util-mariadb/files/mariadb-replicator
similarity index 100%
rename from roles/mariadb/files/mariadb-replicator
rename to roles/float-util-mariadb/files/mariadb-replicator
diff --git a/roles/mariadb/files/mariadb@.service b/roles/float-util-mariadb/files/mariadb@.service
similarity index 100%
rename from roles/mariadb/files/mariadb@.service
rename to roles/float-util-mariadb/files/mariadb@.service
diff --git a/roles/mariadb/handlers/main.yml b/roles/float-util-mariadb/handlers/main.yml
similarity index 100%
rename from roles/mariadb/handlers/main.yml
rename to roles/float-util-mariadb/handlers/main.yml
diff --git a/roles/mariadb/tasks/main.yml b/roles/float-util-mariadb/tasks/main.yml
similarity index 100%
rename from roles/mariadb/tasks/main.yml
rename to roles/float-util-mariadb/tasks/main.yml
diff --git a/roles/mariadb/tasks/monitoring.yml b/roles/float-util-mariadb/tasks/monitoring.yml
similarity index 100%
rename from roles/mariadb/tasks/monitoring.yml
rename to roles/float-util-mariadb/tasks/monitoring.yml
diff --git a/roles/mariadb/tasks/replication.yml b/roles/float-util-mariadb/tasks/replication.yml
similarity index 100%
rename from roles/mariadb/tasks/replication.yml
rename to roles/float-util-mariadb/tasks/replication.yml
diff --git a/roles/mariadb/tasks/user.yml b/roles/float-util-mariadb/tasks/user.yml
similarity index 100%
rename from roles/mariadb/tasks/user.yml
rename to roles/float-util-mariadb/tasks/user.yml
diff --git a/roles/mariadb/templates/exporter.cnf.j2 b/roles/float-util-mariadb/templates/exporter.cnf.j2
similarity index 100%
rename from roles/mariadb/templates/exporter.cnf.j2
rename to roles/float-util-mariadb/templates/exporter.cnf.j2
diff --git a/roles/mariadb/templates/exporter.service.j2 b/roles/float-util-mariadb/templates/exporter.service.j2
similarity index 100%
rename from roles/mariadb/templates/exporter.service.j2
rename to roles/float-util-mariadb/templates/exporter.service.j2
diff --git a/roles/mariadb/templates/mariadb.cnf.j2 b/roles/float-util-mariadb/templates/mariadb.cnf.j2
similarity index 100%
rename from roles/mariadb/templates/mariadb.cnf.j2
rename to roles/float-util-mariadb/templates/mariadb.cnf.j2
diff --git a/roles/mariadb/templates/mysql-wrapper.j2 b/roles/float-util-mariadb/templates/mysql-wrapper.j2
similarity index 100%
rename from roles/mariadb/templates/mysql-wrapper.j2
rename to roles/float-util-mariadb/templates/mysql-wrapper.j2
diff --git a/roles/mariadb/templates/mysqladmin-wrapper.j2 b/roles/float-util-mariadb/templates/mysqladmin-wrapper.j2
similarity index 100%
rename from roles/mariadb/templates/mysqladmin-wrapper.j2
rename to roles/float-util-mariadb/templates/mysqladmin-wrapper.j2
diff --git a/roles/mariadb/templates/mysqldump-wrapper.j2 b/roles/float-util-mariadb/templates/mysqldump-wrapper.j2
similarity index 100%
rename from roles/mariadb/templates/mysqldump-wrapper.j2
rename to roles/float-util-mariadb/templates/mysqldump-wrapper.j2
diff --git a/roles/mariadb/templates/service_override.conf.j2 b/roles/float-util-mariadb/templates/service_override.conf.j2
similarity index 100%
rename from roles/mariadb/templates/service_override.conf.j2
rename to roles/float-util-mariadb/templates/service_override.conf.j2
diff --git a/roles/mariadb/templates/tmpfiles.conf.j2 b/roles/float-util-mariadb/templates/tmpfiles.conf.j2
similarity index 100%
rename from roles/mariadb/templates/tmpfiles.conf.j2
rename to roles/float-util-mariadb/templates/tmpfiles.conf.j2
diff --git a/roles/public-ssl-cert/README.md b/roles/float-util-public-ssl-cert/README.md
similarity index 100%
rename from roles/public-ssl-cert/README.md
rename to roles/float-util-public-ssl-cert/README.md
diff --git a/roles/public-ssl-cert/tasks/main.yml b/roles/float-util-public-ssl-cert/tasks/main.yml
similarity index 100%
rename from roles/public-ssl-cert/tasks/main.yml
rename to roles/float-util-public-ssl-cert/tasks/main.yml
diff --git a/roles/systemd-custom-snippet/README.md b/roles/float-util-systemd-custom-snippet/README.md
similarity index 100%
rename from roles/systemd-custom-snippet/README.md
rename to roles/float-util-systemd-custom-snippet/README.md
diff --git a/roles/systemd-custom-snippet/defaults/main.yml b/roles/float-util-systemd-custom-snippet/defaults/main.yml
similarity index 100%
rename from roles/systemd-custom-snippet/defaults/main.yml
rename to roles/float-util-systemd-custom-snippet/defaults/main.yml
diff --git a/roles/systemd-custom-snippet/tasks/main.yml b/roles/float-util-systemd-custom-snippet/tasks/main.yml
similarity index 100%
rename from roles/systemd-custom-snippet/tasks/main.yml
rename to roles/float-util-systemd-custom-snippet/tasks/main.yml
diff --git a/roles/systemd-custom-snippet/templates/conf.j2 b/roles/float-util-systemd-custom-snippet/templates/conf.j2
similarity index 100%
rename from roles/systemd-custom-snippet/templates/conf.j2
rename to roles/float-util-systemd-custom-snippet/templates/conf.j2
diff --git a/roles/vagrant-compat/files/float-set-clocksource b/roles/float-util-vagrant-compat/files/float-set-clocksource
similarity index 100%
rename from roles/vagrant-compat/files/float-set-clocksource
rename to roles/float-util-vagrant-compat/files/float-set-clocksource
diff --git a/roles/vagrant-compat/files/float-set-clocksource.service b/roles/float-util-vagrant-compat/files/float-set-clocksource.service
similarity index 100%
rename from roles/vagrant-compat/files/float-set-clocksource.service
rename to roles/float-util-vagrant-compat/files/float-set-clocksource.service
diff --git a/roles/vagrant-compat/handlers/main.yml b/roles/float-util-vagrant-compat/handlers/main.yml
similarity index 100%
rename from roles/vagrant-compat/handlers/main.yml
rename to roles/float-util-vagrant-compat/handlers/main.yml
diff --git a/roles/vagrant-compat/tasks/clocksource.yml b/roles/float-util-vagrant-compat/tasks/clocksource.yml
similarity index 100%
rename from roles/vagrant-compat/tasks/clocksource.yml
rename to roles/float-util-vagrant-compat/tasks/clocksource.yml
diff --git a/roles/vagrant-compat/tasks/debug-proxy.yml b/roles/float-util-vagrant-compat/tasks/debug-proxy.yml
similarity index 100%
rename from roles/vagrant-compat/tasks/debug-proxy.yml
rename to roles/float-util-vagrant-compat/tasks/debug-proxy.yml
diff --git a/roles/vagrant-compat/tasks/main.yml b/roles/float-util-vagrant-compat/tasks/main.yml
similarity index 100%
rename from roles/vagrant-compat/tasks/main.yml
rename to roles/float-util-vagrant-compat/tasks/main.yml
diff --git a/roles/sso-server/meta/main.yml b/roles/sso-server/meta/main.yml
deleted file mode 100644
index 8635fd6a25295804b56e6f0677ffd46adc5e6f10..0000000000000000000000000000000000000000
--- a/roles/sso-server/meta/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-dependencies:
-  - role: auth-server
-  - role: auth-server-users
-  - role: geoip-dataset
-    vars:
-      geoip_dataset: 'Country'