diff --git a/lib/Properties.hs b/lib/Properties.hs
index 5720f42f138f92ef26cc77cd7eb87035a895f4fa..262f427cbeb27a9ed7a989bff4762e1091d5a2b1 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -27,6 +27,7 @@ import           LintWriter    (LintWriter, adjust, askContext, askFileDepth,
 import           Paths         (PathResult (..), RelPath (..), parsePath)
 import           Types         (Dep (Link, Local, LocalMap, MapLink))
 import           Uris          (SubstError (..), applySubst)
+import Data.Functor ((<&>))
 
 
 -- | Checks an entire map for "general" lints.
@@ -151,6 +152,7 @@ checkLayerProperty p@(Property name _value) = case name of
     "jitsiRoom" -> do
       lintConfig configAssemblyTag
         >>= setProperty "jitsiRoomAdminTag"
+        . ("assembly-" <>) -- prepend "assembly-" to avoid namespace clashes
       uselessEmptyLayer
       unwrapString' p
         $ suggestProperty $ Property "jitsiTrigger" "onaction"