diff --git a/.gitmodules b/.gitmodules
index c7c7fbb..8cbea7f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "roles/base"]
-	path = roles/base
+	path = roles/do1jlr.base
 	url = https://github.com/roles-ansible/ansible_role_base.git
 [submodule "roles/ranger"]
 	path = roles/ranger
@@ -47,7 +47,7 @@
 	path = roles/geerlingguy.mysql
 	url = https://github.com/geerlingguy/ansible-role-mysql.git
 [submodule "roles/gitea"]
-	path = roles/gitea
+	path = roles/do1jlr.gitea
 	url = https://github.com/roles-ansible/ansible_role_gitea.git
 [submodule "roles/geerlingguy.postgresql"]
 	path = roles/geerlingguy.postgresql
diff --git a/roles/base b/roles/do1jlr.base
similarity index 100%
rename from roles/base
rename to roles/do1jlr.base
diff --git a/roles/gitea b/roles/do1jlr.gitea
similarity index 100%
rename from roles/gitea
rename to roles/do1jlr.gitea
diff --git a/site.yml b/site.yml
index d8c0ce5..2e6a04c 100644
--- a/site.yml
+++ b/site.yml
@@ -7,7 +7,7 @@
 - name: general roles for all hosts
   hosts: all
   roles:
-    - {role: base, tags: [default, packages, base]}
+    - {role: do1jlr.base, tags: [default, packages, base]}
     - {role: ranger, tags: [packages, ranger]}
     - {role: bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}
     - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'}
@@ -30,7 +30,7 @@
     - {role: do1jlr.acmetool, tags: [web, acmetool]}
     - {role: do1jlr.nginx, tags: [web, nginx]}
     - {role: geerlingguy.mysql, tags: [web, git, mysql]}
-    - {role: gitea, tags: [web, gitea, git]}
+    - {role: do1jlr.gitea, tags: [web, gitea, git]}
     - {role: goaccess, tags: [web, goaccess]}
 
 - name: deploy mail config