diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index 0b89332..d22acf6 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -140,6 +140,7 @@ profile:
         script: /usr/bin/node build/src/discordas.js -c config.yaml -f discord-registration.yaml -p 9001
       webhook:
         repo: https://github.com/matrix-org/matrix-hookshot.git
+        branch: main
         appservice_id: f4de7550133374c703c4cd64c5898cf1b82b65d4a5c2aca93863ee1fb859df91
         build: True
         script: /usr/bin/node App/BridgeApp.js config.yaml webhook-registration.yaml
diff --git a/salt/profile/matrix/files/worker.yaml b/salt/profile/matrix/files/worker.yaml
index 075ca8a..5e357e6 100644
--- a/salt/profile/matrix/files/worker.yaml
+++ b/salt/profile/matrix/files/worker.yaml
@@ -10,7 +10,7 @@ worker_listeners:
     port: {{ port }}
     resources:
       - names:
-        {%- if resources|length %}
+        {%- if resources is mapping %}
         {%- for resource in resources.items() %}
         - {{ resource }}
         {%- endfor %}
@@ -19,7 +19,7 @@ worker_listeners:
         - federation
         {%- endif %}
 
-{%- if config|length %}
+{%- if config is mapping %}
 {% for setting, value in config.items() %}
 {{ setting }}: {{ value }}
 {% endfor %}
diff --git a/salt/profile/matrix/files/workers.nginx b/salt/profile/matrix/files/workers.nginx
index 9ad9e34..eab9606 100644
--- a/salt/profile/matrix/files/workers.nginx
+++ b/salt/profile/matrix/files/workers.nginx
@@ -10,7 +10,7 @@ upstream {{ app }}_{{ loop.index }} {
     {%- endfor %}
 }
 
-{%- if type.get('rest')|lenght %}
+{%- if type.get('rest') is mapping %}
 {%- for uri in type.get('rest') %}
 location ~ {{ uri }} {
     proxy_pass http://{{ app }}_{{ loop.index }}$request_uri;