diff --git a/images/fcos-bastion-image/root/usr/lib/systemd/system/dhcp-init.service b/images/fcos-bastion-image/root/usr/lib/systemd/system/dhcp-init.service
index 4234d04..9094937 100644
--- a/images/fcos-bastion-image/root/usr/lib/systemd/system/dhcp-init.service
+++ b/images/fcos-bastion-image/root/usr/lib/systemd/system/dhcp-init.service
@@ -3,7 +3,6 @@ Description=Init configuration for dhcp and tftpboot with dnsmasq
 RequiresMountsFor=%t/containers
 Wants=network-online.target
 After=network-online.target
-ConditionPathExists=!/var/.dhcp-configured
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
diff --git a/images/fcos-bastion-image/root/usr/share/bastion_services/dhcp/dnsmasq.conf b/images/fcos-bastion-image/root/usr/share/bastion_services/dhcp/dnsmasq.conf
index 2d7c93a..1649a67 100644
--- a/images/fcos-bastion-image/root/usr/share/bastion_services/dhcp/dnsmasq.conf
+++ b/images/fcos-bastion-image/root/usr/share/bastion_services/dhcp/dnsmasq.conf
@@ -10,7 +10,7 @@ dhcp-range=192.168.80.50,192.168.80.199,6h
 dhcp-option=option:netmask,255.255.252.0
 
 enable-ra
-dhcp-range=fd99:2222:3456::50,fd99:2222:3456::199,6h
+dhcp-range=fd99:2222:3456::50,fd99:2222:3456::199,64,6h
 
 dhcp-option=option:router,192.168.80.1
 dhcp-option=option:dns-server,192.168.80.1
@@ -18,7 +18,6 @@ dhcp-option=option:ntp-server,192.168.80.1
 
 dhcp-option=option6:dns-server,[fd99:2222:3456::1]
 dhcp-option=option6:ntp-server,[fd99:2222:3456::1]
-dhcp-option=option6:router,[fd99:2222:3456::1]
 
 enable-tftp
 tftp-root=/var/lib/tftpboot
@@ -27,7 +26,8 @@ dhcp-match=set:efi,option:client-arch,9
 dhcp-match=set:efi_arm,option:client-arch,11
 dhcp-option=tag:efi,67,grubx64.efi
 dhcp-option=tag:efi_arm,67,grubaa64.efi
-
+dhcp-option=tag:efi,18,x86_64
+dhcp-option=tag:efi_arm,18,aarch64
 dhcp-hostsdir=/var/lib/hosts/hostsdir
 dhcp-optsdir=/var/lib/hosts/optsdir
 expand-hosts