diff --git a/generate-templates.yaml b/generate-templates.yaml
index 99435782..fff42ca3 100644
--- a/generate-templates.yaml
+++ b/generate-templates.yaml
@@ -125,8 +125,8 @@
 
   - name: Load CentOS Stream 9 containerdisk and image urls
     set_fact:
-      centos9stream_containerdisk_urls: "{{ lookup('osinfo', 'centos-stream9') |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'eq', 'containerdisk') |map(attribute='url') |map('replace', 'docker://', '') |list }}"
-      centos9stream_image_urls: "{{ lookup('osinfo', 'centos-stream9') |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'in', ['raw', 'qcow2']) |map(attribute='url') |list }}"
+      centos9stream_containerdisk_urls: "{{ lookup('osinfo', 'centos-stream9') |attr('image_list') |selectattr('architecture', 'eq', target_arch) |selectattr('format', 'eq', 'containerdisk') |map(attribute='url') |map('replace', 'docker://', '') |list }}"
+      centos9stream_image_urls: "{{ lookup('osinfo', 'centos-stream9') |attr('image_list') |selectattr('architecture', 'eq', target_arch) |selectattr('format', 'in', ['raw', 'qcow2']) |map(attribute='url') |list }}"
 
   - name: Generate CentOS Stream 9 templates
     template:
diff --git a/templates/centos-stream9.tpl.yaml b/templates/centos-stream9.tpl.yaml
index 7848840d..f03674c0 100644
--- a/templates/centos-stream9.tpl.yaml
+++ b/templates/centos-stream9.tpl.yaml
@@ -96,7 +96,7 @@ objects:
           kubevirt.io/domain: ${NAME}
           kubevirt.io/size: {{ item.flavor }}
       spec:
-        architecture: amd64
+        architecture: "{{ 'amd64' if target_arch == 'x86_64' else target_arch }}"
         domain:
 {% if item.iothreads %}
           ioThreadsPolicy: shared