diff --git a/roles/custom/matrix-livekit/defaults/main.yml b/roles/custom/matrix-livekit-server/defaults/main.yml
similarity index 100%
rename from roles/custom/matrix-livekit/defaults/main.yml
rename to roles/custom/matrix-livekit-server/defaults/main.yml
diff --git a/roles/custom/matrix-livekit/tasks/install.yml b/roles/custom/matrix-livekit-server/tasks/install.yml
similarity index 100%
rename from roles/custom/matrix-livekit/tasks/install.yml
rename to roles/custom/matrix-livekit-server/tasks/install.yml
diff --git a/roles/custom/matrix-livekit/tasks/main.yml b/roles/custom/matrix-livekit-server/tasks/main.yml
similarity index 100%
rename from roles/custom/matrix-livekit/tasks/main.yml
rename to roles/custom/matrix-livekit-server/tasks/main.yml
diff --git a/roles/custom/matrix-livekit/tasks/uninstall.yml b/roles/custom/matrix-livekit-server/tasks/uninstall.yml
similarity index 100%
rename from roles/custom/matrix-livekit/tasks/uninstall.yml
rename to roles/custom/matrix-livekit-server/tasks/uninstall.yml
diff --git a/roles/custom/matrix-livekit/tasks/validate_config.yml b/roles/custom/matrix-livekit-server/tasks/validate_config.yml
similarity index 100%
rename from roles/custom/matrix-livekit/tasks/validate_config.yml
rename to roles/custom/matrix-livekit-server/tasks/validate_config.yml
diff --git a/roles/custom/matrix-livekit/templates/labels.j2 b/roles/custom/matrix-livekit-server/templates/labels.j2
similarity index 100%
rename from roles/custom/matrix-livekit/templates/labels.j2
rename to roles/custom/matrix-livekit-server/templates/labels.j2
diff --git a/roles/custom/matrix-livekit/templates/livekit.yaml.j2 b/roles/custom/matrix-livekit-server/templates/livekit.yaml.j2
similarity index 100%
rename from roles/custom/matrix-livekit/templates/livekit.yaml.j2
rename to roles/custom/matrix-livekit-server/templates/livekit.yaml.j2
diff --git a/roles/custom/matrix-livekit/templates/systemd/matrix-livekit-server.service.j2 b/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2
similarity index 100%
rename from roles/custom/matrix-livekit/templates/systemd/matrix-livekit-server.service.j2
rename to roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2
diff --git a/setup.yml b/setup.yml
index cbc3e1673..8055b46ba 100644
--- a/setup.yml
+++ b/setup.yml
@@ -131,6 +131,8 @@
     - custom/matrix-media-repo
     - custom/matrix-pantalaimon
     - custom/matrix-element-call
+    - custom/matrix-livekit-server
+    - custom/matrix-jwt-service
 
     - role: galaxy/postgres_backup