diff --git a/test/image-blueprints/layer5-bootc/group1/cos9-bootc-source.containerfile b/test/image-blueprints/layer5-bootc/group1/cos9-bootc-source.containerfile
index 1f8c3e94df..9e69e18faf 100644
--- a/test/image-blueprints/layer5-bootc/group1/cos9-bootc-source.containerfile
+++ b/test/image-blueprints/layer5-bootc/group1/cos9-bootc-source.containerfile
@@ -53,6 +53,3 @@ monitor_path = ""\n\
 monitor_cgroup = "system.slice"\n\
 monitor_exec_cgroup = ""\n\
 privileged_without_host_devices = false\n' > "/etc/crio/crio.conf.d/microshift-crun.conf"
-
-# Extend Greenboot wait timeout to 10m for MicroShift to be ready
-RUN printf '\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n' >> /etc/greenboot/greenboot.conf
diff --git a/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source.containerfile b/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source.containerfile
index 68b1d22b8b..914fb19b92 100644
--- a/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source.containerfile
+++ b/test/image-blueprints/layer5-bootc/group1/rhel94-bootc-source.containerfile
@@ -41,6 +41,3 @@ RUN firewall-offline-cmd --zone=public --add-port=22/tcp && \
     firewall-offline-cmd --zone=public --add-port=6443/tcp && \
     firewall-offline-cmd --zone=public --add-port=30000-32767/tcp && \
     firewall-offline-cmd --zone=public --add-port=30000-32767/udp
-
-# Extend Greenboot wait timeout to 10m for MicroShift to be ready
-RUN printf '\nMICROSHIFT_WAIT_TIMEOUT_SEC=600\n' >> /etc/greenboot/greenboot.conf
diff --git a/test/kickstart-templates/includes/post-system.cfg b/test/kickstart-templates/includes/post-system.cfg
index 13427c878f..26fb1add42 100644
--- a/test/kickstart-templates/includes/post-system.cfg
+++ b/test/kickstart-templates/includes/post-system.cfg
@@ -26,3 +26,6 @@ ln -sf /dev/null /etc/systemd/user/grub-boot-success.timer
 echo "fs.inotify.max_user_watches = 65536" >> /etc/sysctl.conf
 echo "fs.inotify.max_user_instances = 8192" >> /etc/sysctl.conf
 sysctl --system
+
+# Extend Greenboot wait timeout to 10m for MicroShift to be ready
+echo "MICROSHIFT_WAIT_TIMEOUT_SEC=600" >> /etc/greenboot/greenboot.conf