diff --git a/templates/room.hbs b/templates/room.hbs
index 41efd401b49a10ce02dd39bbe12c1a0df8653923..b182195d3b9f4de3749cd8ce8863874b94bf5415 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -61,48 +61,38 @@
             </template>
 
             <template id="remote-avatar-template">
-                <a-entity
-                    cached-gltf-model="#bot-skinned-mesh"
-                >
-                    <a-proxy-entity selector=".Head" wait-for-event="model-loaded">
-                        <template>
+                <a-gltf-entity src="#bot-skinned-mesh" inflate="true">
+                    <template data-selector=".Head">
+                        <a-entity
+                            networked-audio-source
+                            networked-audio-analyser
+                            matcolor-audio-feedback="objectName: Head_Mesh"
+                            scale-audio-feedback
+                            personal-space-invader
+                            animation-mixer
+                        >
                             <a-entity
-                                networked-audio-source
-                                networked-audio-analyser
-                                matcolor-audio-feedback="objectName: Head_Mesh"
-                                scale-audio-feedback
-                                personal-space-invader
-                                animation-mixer
-                            >
-                                <a-entity
-                                    class="nametag"
-                                    nametag-transform="follow: .Head"
-                                    text="side: double; align: center; color: #ddd"
-                                    position="0 2.5 0"
-                                    scale="6 6 6"
-                                ></a-entity>
-                            </a-entity>
-                        </template>
-                    </a-proxy-entity>
-
-                    <a-proxy-entity selector=".Body" wait-for-event="model-loaded">
-                        <template>
-                            <a-entity body-controller="eyeNeckOffset: 0 -0.11 0.09; neckHeight: 0.05" ></a-entity>
-                        </template>
-                    </a-proxy-entity>
-
-                    <a-proxy-entity selector=".Lefthand" wait-for-event="model-loaded">
-                        <template>
-                            <a-entity personal-space-invader bone-visibility ></a-entity>
-                        </template>
-                    </a-proxy-entity>
-
-                    <a-proxy-entity selector=".RightHand" wait-for-event="model-loaded">
-                        <template>
-                            <a-entity personal-space-invader bone-visibility ></a-entity>
-                        </template>
-                    </a-proxy-entity>
-                </a-entity>
+                                class="nametag"
+                                nametag-transform="follow: .Head"
+                                text="side: double; align: center; color: #ddd"
+                                position="0 2.5 0"
+                                scale="6 6 6"
+                            ></a-entity>
+                        </a-entity>
+                    </template>
+
+                    <template data-selector=".Body">
+                        <a-entity body-controller="eyeNeckOffset: 0 -0.11 0.09; neckHeight: 0.05" ></a-entity>
+                    </template>
+
+                    <template data-selector=".LeftHand">
+                        <a-entity personal-space-invader bone-visibility ></a-entity>
+                    </template>
+
+                    <template data-selector=".RightHand">
+                        <a-entity personal-space-invader bone-visibility ></a-entity>
+                    </template>
+                </a-gltf-entity>
             </template>
         </a-assets>