diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 1b4107bfee..2b407920af 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -384,3 +384,22 @@
   tags:
   - koji_builder
   - koji_builder/osbuildapi
+
+- name: create override dir for systemd-nspawn containers config
+  file:
+       state: directory
+       owner: root
+       group: root
+       mode: 0755
+       path: /etc/systemd/system/machine-.scope.d
+  when: inventory_hostname.startswith(('buildhw-a64'))
+  tags:
+  - koji_builder
+  - koji_builder/nspawn
+
+- name: create override config for systemd-nspawn containers to allow coredumps
+  template: src=nspawn-override.conf dest=/etc/systemd/system/machine-.scope.d/80-infra.conf mode=0644
+  when: inventory_hostname.startswith(('buildhw-a64'))
+  tags:
+  - koji_builder
+  - koji_builder/nspawn
diff --git a/roles/koji_builder/templates/nspawn-override.conf b/roles/koji_builder/templates/nspawn-override.conf
new file mode 100644
index 0000000000..aa6f4346e0
--- /dev/null
+++ b/roles/koji_builder/templates/nspawn-override.conf
@@ -0,0 +1,2 @@
+[Scope]
+LimitCORE=infinity