diff --git a/src/main/kotlin/eu/fosil/okupamicoche/entities/UserKeycloak.kt b/src/main/kotlin/eu/fosil/okupamicoche/entities/UserKeycloak.kt
index d745589..cc8e86e 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/entities/UserKeycloak.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/entities/UserKeycloak.kt
@@ -23,7 +23,7 @@ class UserKeycloak(
         return User(
                 id,
                 username,
-                "@$username:synapse",
+                "@$username:okupamicoche-synapse",
                 name,
                 email
         )
diff --git a/src/main/kotlin/eu/fosil/okupamicoche/spring/services/MatrixService.kt b/src/main/kotlin/eu/fosil/okupamicoche/spring/services/MatrixService.kt
index d1984dc..2e84b74 100644
--- a/src/main/kotlin/eu/fosil/okupamicoche/spring/services/MatrixService.kt
+++ b/src/main/kotlin/eu/fosil/okupamicoche/spring/services/MatrixService.kt
@@ -5,8 +5,6 @@ import eu.fosil.okupamicoche.usecases.matrix.MatrixApi
 import mu.KotlinLogging
 import net.folivo.matrix.core.model.MatrixId
 import net.folivo.matrix.restclient.MatrixClient
-//import net.folivo.matrix.core.model.MatrixId
-//import net.folivo.matrix.restclient.MatrixClient
 import org.springframework.stereotype.Service
 import java.util.stream.Collectors
 
@@ -19,7 +17,7 @@ class MatrixService(private val matrixClient: MatrixClient) : MatrixApi {
         val usersToInviteId = usersToInvite.stream().map { user -> MatrixId.UserId(user.matrixId) }
         val roomId = matrixClient.roomsApi.createRoom(
                 name = name,
-                roomAliasId = MatrixId.RoomAliasId("#$alias:synapse"),
+                roomAliasId = MatrixId.RoomAliasId("#$alias:okupamicoche-synapse"),
                 invite = usersToInviteId.collect(Collectors.toSet()),
                 topic = topic
         )