diff --git a/ansible/main.yml b/ansible/main.yml
index 06364fa..5de6cbb 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -15,16 +15,16 @@
     - boot
     - store
   roles:
-        - { role: open-ports,       tags: open-ports }
-        - { role: swap-file,        tags: swap-file  }
-        - { role: certbot,          tags: certbot    }
-        - { role: nim-waku,         tags: nim-waku   }
-        - { role: nginx,            tags: nginx      }
+    - { role: infra-role-open-ports,   tags: open-ports  }
+    - { role: infra-role-swap-file,    tags: swap-file   }
+    - { role: infra-role-certbot,      tags: certbot     }
+    - { role: infra-role-nim-waku,     tags: nim-waku    }
+    - { role: infra-role-nginx,        tags: nginx       }
 
 - name: Configure Waku Storage DB Nodes
   serial: '{{ serial|default(1) }}'
   hosts: store-db
   roles:
-        - { role: open-ports,             tags: open-ports }
-        - { role: swap-file,              tags: swap-file  }
-        - { role: infra-role-postgres-ha, tags: postgres-ha    }
+    - { role: infra-role-open-ports,   tags: open-ports  }
+    - { role: infra-role-swap-file,    tags: swap-file   }
+    - { role: infra-role-postgres-ha,  tags: postgres-ha }
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 0fcbf0d..20b16db 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -7,23 +7,23 @@
   src: git@github.com:status-im/infra-role-wireguard.git
   scm: git
 
-- name: open-ports
+- name: infra-role-open-ports
   src: git@github.com:status-im/infra-role-open-ports.git
   scm: git
 
-- name: swap-file
+- name: infra-role-swap-file
   src: git@github.com:status-im/infra-role-swap-file.git
   scm: git
 
-- name: consul-service
+- name: infra-role-consul-service
   src: git@github.com:status-im/infra-role-consul-service.git
   scm: git
 
-- name: systemd-timer
+- name: infra-role-systemd-timer
   src: git@github.com:status-im/infra-role-systemd-timer.git
   scm: git
 
-- name: nim-waku
+- name: infra-role-nim-waku
   src: git@github.com:status-im/infra-role-nim-waku.git
   version: 2eaeb82a0c5aae2b80e46a7c3965809f15d9b2cc
   scm: git