diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index fb1762c7b..d5dfb3914 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1771,6 +1771,8 @@ matrix_client_hydrogen_self_check_validate_certificates: "{{ false if matrix_ssl
 
 matrix_client_cinny_enabled: false
 
+matrix_client_cinny_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
+
 # Normally, matrix-nginx-proxy is enabled and nginx can reach Cinny over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
 # the HTTP port to the local host.
diff --git a/roles/matrix-client-cinny/tasks/validate_config.yml b/roles/matrix-client-cinny/tasks/validate_config.yml
index 198782e93..d8e804c5e 100644
--- a/roles/matrix-client-cinny/tasks/validate_config.yml
+++ b/roles/matrix-client-cinny/tasks/validate_config.yml
@@ -3,6 +3,6 @@
   fail:
     msg: >
       You need to define a required configuration setting (`{{ item }}`) to use Cinny.
-  when: "(vars[item] == '' or vars[item] is none) and matrix_client_cinny_container_image_self_build|bool"
+  when: "vars[item] == '' or vars[item] is none"
   with_items:
     - "matrix_client_cinny_default_hs_url"