diff --git a/playbooks/borg-client.yaml b/playbooks/borg-client.yaml
index e33f250..5ba7a36 100644
--- a/playbooks/borg-client.yaml
+++ b/playbooks/borg-client.yaml
@@ -16,17 +16,17 @@
   hosts: borg-client:!disabled
 
   tasks:
-    - name: Setup openstack.borgbackup role
+    - name: Setup windmill.borgbackup role
       include_role:
-        name: openstack.borgbackup
+        name: windmill.borgbackup
       vars:
         borgbackup_task_manager:
           - pre
           - install
 
-    - name: Setup openstack.borgmatic role
+    - name: Setup windmill.borgmatic role
       include_role:
-        name: openstack.borgmatic
+        name: windmill.borgmatic
 
     - name: Generage borgbackup SSH keys
       become: true
@@ -52,11 +52,11 @@
         src: ~/.ssh/id_rsa.pub
       register: borg_id_rsa_pub
 
-    - name: Setup openstack.ssh role
+    - name: Setup windmill.ssh role
       become: true
       become_user: "borg_{{ inventory_hostname_short }}"
       include_role:
-        name: openstack.ssh
+        name: windmill.ssh
         apply:
           delegate_to: "{{ item }}"
       vars:
diff --git a/playbooks/borg-server.yaml b/playbooks/borg-server.yaml
index a9aa558..72e9e54 100644
--- a/playbooks/borg-server.yaml
+++ b/playbooks/borg-server.yaml
@@ -16,9 +16,9 @@
   hosts: borg-server:!disabled
 
   tasks:
-    - name: Setup openstack.borgbackup role
+    - name: Setup windmill.borgbackup role
       include_role:
-        name: openstack.borgbackup
+        name: windmill.borgbackup
 
     - name: Ensure /opt/backups exists
       become: true
@@ -27,9 +27,9 @@
         state: directory
         mode: 0755
 
-    - name: Setup openstack.borgbackup role
+    - name: Setup windmill.borgbackup role
       include_role:
-        name: openstack.borgbackup
+        name: windmill.borgbackup
       vars:
         borgbackup_task_manager:
           - pre
diff --git a/tools/requirements.yaml b/tools/requirements.yaml
index 1e2f2c9..196506c 100644
--- a/tools/requirements.yaml
+++ b/tools/requirements.yaml
@@ -1,9 +1,9 @@
 ---
-- name: openstack.borgbackup
+- name: windmill.borgbackup
   src: git+https://opendev.org/windmill/ansible-role-borgbackup
 
-- name: openstack.borgmatic
+- name: windmill.borgmatic
   src: git+https://opendev.org/windmill/ansible-role-borgmatic
 
-- name: openstack.ssh
+- name: windmill.ssh
   src: git+https://opendev.org/windmill/ansible-role-ssh