diff --git a/playbooks/all.yml b/playbooks/all.yml
index 8d9f551..79985ab 100755
--- a/playbooks/all.yml
+++ b/playbooks/all.yml
@@ -12,7 +12,7 @@
       tags: [ common ]
     - role: adminuser
       tags: [ adminuser, common ]
-    - role: docker
+    - role: geerlingguy.docker
       tags: [ docker, common, skip-pull ]
     - role: motd
       vars:
@@ -21,7 +21,7 @@
           - kubelet
           - postgresql
       tags: [ motd, common ]
-    - role: sshd
+    - role: willshersystems.sshd
       vars:
         sshd:
           AcceptEnv: "LANG LC_*"
diff --git a/playbooks/home_media.yml b/playbooks/home_media.yml
index 1743030..0e7aa76 100755
--- a/playbooks/home_media.yml
+++ b/playbooks/home_media.yml
@@ -102,7 +102,7 @@
           - /data/sonarr
         backup_time: "Mon *-*-* 02:00:00"
       tags: [ backup ]
-    - role: postgresql
+    - role: geerlingguy.postgresql
       vars:
         postgresql_global_config_options:
           - option: listen_addresses
@@ -133,7 +133,7 @@
           - name: firefly
             owner: firefly
       tags: [ pis, storage, psql ]
-    - role: nfs
+    - role: geerlingguy.nfs
       vars:
         nfs_exports:
           - "/data/shared/media    192.168.0.0/16(ro,no_root_squash,sync) 172.23.0.0/16(ro,no_root_squash,sync)"
diff --git a/playbooks/prod_db.yml b/playbooks/prod_db.yml
index f510d2d..d8e5e78 100755
--- a/playbooks/prod_db.yml
+++ b/playbooks/prod_db.yml
@@ -6,7 +6,7 @@
   roles:
     - role: backup
       tags: [ backup ]
-    - role: postgresql
+    - role: geerlingguy.postgresql
       vars:
         postgresql_global_config_options:
           - option: listen_addresses
diff --git a/playbooks/tags_snmp.yml b/playbooks/tags_snmp.yml
index 441b563..0eb0b27 100755
--- a/playbooks/tags_snmp.yml
+++ b/playbooks/tags_snmp.yml
@@ -3,7 +3,7 @@
 ---
 - hosts: tags_snmp
   roles:
-    - role: snmpd
+    - role: oefenweb.snmpd
       vars:
         snmpd_internal_user:
           username: "{{ secret_snmp_internal_username }}"
diff --git a/requirements.yml b/requirements.yml
index 2bc5720..eccad56 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -3,29 +3,22 @@
 #  ansible-galaxy install -r requirements.yml
 collections:
   - netbox.netbox
-
 roles:
   # Upstream: https://github.com/willshersystems/ansible-sshd
-  - name: sshd
-    src: willshersystems.sshd
+  - src: willshersystems.sshd
     version: v0.12.0
   # Upstream: https://github.com/geerlingguy/ansible-role-nfs
-  - name: nfs
-    src: geerlingguy.nfs
+  - src: geerlingguy.nfs
     version: 2.0.0
   # Upstream: https://github.com/geerlingguy/ansible-role-docker
-  - name: docker
-    src: geerlingguy.docker
+  - src: geerlingguy.docker
     version: 3.0.0
   # Upstream: https://github.com/geerlingguy/ansible-role-postgresql
-  - name: postgresql
-    src: geerlingguy.postgresql
+  - src: geerlingguy.postgresql
     version: 2.2.1
   # Upstream: https://github.com/geerlingguy/ansible-role-certbot
-  - name: certbot
-    src: geerlingguy.certbot
+  - src: geerlingguy.certbot
     version: 3.1.0
   # Upstream: https://github.com/Oefenweb/ansible-snmpd
-  - name: snmpd
-    src: oefenweb.snmpd
+  - src: oefenweb.snmpd
     version: master