diff --git a/group-all.yml b/group-all.yml
index cb380e2..2d95128 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -8,7 +8,7 @@
     ansible_python_interpreter: /usr/bin/python3
 
   roles:
-    - role: ansible.timezone
+    - role: adriagalin.timezone
       vars:
         ag_timezone: "{{ timezone }}"
     - role: users
diff --git a/host-krypton.yml b/host-krypton.yml
index 6d9b144..7a45ca0 100644
--- a/host-krypton.yml
+++ b/host-krypton.yml
@@ -22,12 +22,12 @@
     # role 'docker_setup' applied through group 'docker_host'
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
-    - role: ansible-role-dehydrated
+    - role: 24367dfa.dehydrated
       vars:
         dehydrated_contact_email: "{{ server_admin }}"
         dehydrated_domains:
           - name: entities-validation.svc.n39.eu
-    - role: ansible-role-dehydrated_cron
+    - role: penguineer.dehydrated_cron
 
   tasks:
 
diff --git a/host-platon.yml b/host-platon.yml
index b0623ad..41d033c 100644
--- a/host-platon.yml
+++ b/host-platon.yml
@@ -6,7 +6,7 @@
     door_open_command: '/home/pi/sesame-open.sh'
     ble_keykeeper_dir: '/home/pi/netz39_ble_keykeeper'
   roles:
-    - role: ble-keykeeper-role
+    - role: maz3max.ble_keykeeper
       vars:
         ble_keykeeper_user: "{{ gatekeeper_user }}"
         ble_keykeeper_group: "{{ gatekeeper_user }}"
diff --git a/host-pottwal.yml b/host-pottwal.yml
index f2cff3e..9df71c4 100644
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@@ -6,7 +6,7 @@
     # role 'docker_setup' applied through group 'docker_host'
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
-    - role: ansible-role-dehydrated
+    - role: 24367dfa.dehydrated
       vars:
         dehydrated_contact_email: "{{ server_admin }}"
         dehydrated_domains:
@@ -25,7 +25,7 @@
           - name: "{{ grafana_domain_name }}"
           - name: "{{ homebox_domain_name }}"
           - name: spaceapi.n39.eu
-    - role: ansible-role-dehydrated_cron
+    - role: penguineer.dehydrated_cron
     - role: dd24_dyndns_cron
       # variables are set in the inventory
     - role: desec_dyndns_cron
diff --git a/host-radon.yml b/host-radon.yml
index 352232e..58e55fa 100644
--- a/host-radon.yml
+++ b/host-radon.yml
@@ -24,7 +24,7 @@
     # role 'docker_setup' applied through group 'docker_host'
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
-    - role: ansible-role-dehydrated
+    - role: 24367dfa.dehydrated
       vars:
         dehydrated_contact_email: "{{ server_admin }}"
         dehydrated_domains:
@@ -32,7 +32,7 @@
           - name: rabbitmq.n39.eu
           - name: pwr-meter-pulse-gw-19i.svc.n39.eu
           - name: labelprinter.n39.eu
-    - role: ansible-role-dehydrated_cron
+    - role: penguineer.dehydrated_cron
 
 
   tasks:
diff --git a/host-tau.yml b/host-tau.yml
index a1d4b46..665f926 100644
--- a/host-tau.yml
+++ b/host-tau.yml
@@ -21,7 +21,7 @@
   roles:
     # role 'docker_setup' applied through group 'docker_host'
     - role: apache
-    - role: ansible-role-dehydrated_cron
+    - role: penguineer.dehydrated_cron
 
   tasks:
     - name: Setup docker network
@@ -35,7 +35,7 @@
 
     - name: Setup Dehydrated
       include_role:
-        name: ansible-role-dehydrated
+        name: 24367dfa.dehydrated
       vars:
         dehydrated_contact_email: "{{ server_admin }}"
         dehydrated_domains:
diff --git a/host-wittgenstein.yml b/host-wittgenstein.yml
index f4b2190..c770b5f 100644
--- a/host-wittgenstein.yml
+++ b/host-wittgenstein.yml
@@ -8,7 +8,7 @@
         docker_data_root: "/srv/docker"
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
-    - role: ansible-role-dehydrated
+    - role: 24367dfa.dehydrated
       vars:
         dehydrated_contact_email: "{{ server_admin }}"
     - role: penguineer.dehydrated_cron
diff --git a/requirements.yml b/requirements.yml
index 5a23b6f..975ae64 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -2,13 +2,17 @@
 roles:
   - src: hifis.unattended_upgrades
     version: v3.2.1
-  - src: git+https://github.com/adriagalin/ansible.timezone.git
+  - name: adriagalin.timezone
+    src: git+https://github.com/adriagalin/ansible.timezone.git
     version: 4.0.0
-  - src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
+  - name: 24367dfa.dehydrated
+    src: git+https://github.com/24367dfa/ansible-role-dehydrated.git
     version: 2.0.0
-  - src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
+  - name: penguineer.dehydrated_cron
+    src: https://github.com/penguineer/ansible-role-dehydrated_cron.git
     version: v1.1.0
-  - src: git+https://github.com/maz3max/ble-keykeeper-role.git
+  - name: maz3max.ble_keykeeper
+    src: git+https://github.com/maz3max/ble-keykeeper-role.git
     version: v1.1.0
   - src: lespocky.telegraf_docker_in_docker
     version: v0.2.1