diff --git a/image-builder/Makefile b/image-builder/Makefile
index d8c61e6..06856d9 100644
--- a/image-builder/Makefile
+++ b/image-builder/Makefile
@@ -46,7 +46,7 @@ help: ## This help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 # Make target name that zuul expects for each project in this repo
-images: build generate_iso package_qcow
+images: build generate_iso package_qcow clean
 
 build:
 	set -ex
diff --git a/image-builder/assets/playbooks/roles/osconfig/tasks/main.yaml b/image-builder/assets/playbooks/roles/osconfig/tasks/main.yaml
index b6c488d..0357f02 100644
--- a/image-builder/assets/playbooks/roles/osconfig/tasks/main.yaml
+++ b/image-builder/assets/playbooks/roles/osconfig/tasks/main.yaml
@@ -37,6 +37,9 @@
 - name: "unattended upgrades"
   include_tasks: unattended-upgrades.yaml
   when: run_context == default_run_context
+- name: "configure systemd-resolved"
+  include_tasks: systemd-resolved.yaml
+  when: run_context == default_run_context
 - name: "configure base systemd"
   include_tasks: systemd.yaml
   when: run_context == default_run_context
diff --git a/image-builder/assets/playbooks/roles/osconfig/tasks/systemd-resolved.yaml b/image-builder/assets/playbooks/roles/osconfig/tasks/systemd-resolved.yaml
index b1f1aac..3a6e6b0 100644
--- a/image-builder/assets/playbooks/roles/osconfig/tasks/systemd-resolved.yaml
+++ b/image-builder/assets/playbooks/roles/osconfig/tasks/systemd-resolved.yaml
@@ -5,3 +5,14 @@
 #    dest: "/etc/systemd/resolved.conf"
 #    mode: 0644
 #  when: domain is defined
+
+- name: "systemd-resolved | Ensuring systemd-resolved overrides directory exists"
+  file:
+    path: "/etc/systemd/system/systemd-resolved.service.d"
+    state: directory
+    mode: '0755'
+- name: "systemd-resolved | Place startup retry override"
+  template:
+    src: systemd-resolved-overrides.j2
+    dest: "/etc/systemd/system/systemd-resolved.service.d/override.conf"
+    mode: '0644'
diff --git a/image-builder/assets/playbooks/roles/osconfig/templates/systemd-resolved-overrides.j2 b/image-builder/assets/playbooks/roles/osconfig/templates/systemd-resolved-overrides.j2
new file mode 100644
index 0000000..3bf9e92
--- /dev/null
+++ b/image-builder/assets/playbooks/roles/osconfig/templates/systemd-resolved-overrides.j2
@@ -0,0 +1,2 @@
+[Unit]
+StartLimitBurst=0