diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh
index 566f9b40a..61e6b8804 100644
--- a/lib/debootstrap.sh
+++ b/lib/debootstrap.sh
@@ -74,9 +74,6 @@ PRE_INSTALL_DISTRIBUTION_SPECIFIC
 	# install from apt.armbian.com
 	[[ $EXTERNAL_NEW == prebuilt ]] && chroot_installpackages "yes"
 
-	# remove existing ssh keys. They will be created in 1st boot process
-	rm -f $SDCARD/etc/ssh/ssh_host*
-
 	# stage: user customization script
 	# NOTE: installing too many packages may fill tmpfs mount
 	customize_image
diff --git a/packages/bsp/common/lib/systemd/system/armbian-firstrun-config.service b/packages/bsp/common/lib/systemd/system/armbian-firstrun-config.service
index 08e701d96..20943ec42 100644
--- a/packages/bsp/common/lib/systemd/system/armbian-firstrun-config.service
+++ b/packages/bsp/common/lib/systemd/system/armbian-firstrun-config.service
@@ -3,15 +3,13 @@
 
 [Unit]
 Description=Armbian first run optional user configuration
-Wants=network-online.target first-boot-complete.target
+Wants=network-online.target
 After=network.target network-online.target
-Before=first-boot-complete.target
 ConditionPathExists=/boot/armbian_first_run.txt
 ConditionPathExists=/root/.not_logged_in_yet
-ConditionFirstBoot=yes
 
 [Service]
-Type=oneshot
+Type=idle
 RemainAfterExit=yes
 ExecStart=/usr/lib/armbian/armbian-firstrun-config
 TimeoutStartSec=2min
diff --git a/packages/bsp/common/lib/systemd/system/armbian-firstrun.service b/packages/bsp/common/lib/systemd/system/armbian-firstrun.service
index 81ce7b4d6..64a390950 100644
--- a/packages/bsp/common/lib/systemd/system/armbian-firstrun.service
+++ b/packages/bsp/common/lib/systemd/system/armbian-firstrun.service
@@ -4,16 +4,14 @@
 
 [Unit]
 Description=Armbian first run tasks
-Wants=first-boot-complete.target
-Before=getty.target system-getty.slice first-boot-complete.target ssh.service
-After=armbian-resize-filesystem.service
-ConditionFirstBoot=yes
+Before=getty.target system-getty.slice
 
 [Service]
-Type=oneshot
+Type=simple
 RemainAfterExit=yes
 ExecStart=/usr/lib/armbian/armbian-firstrun start
 TimeoutStartSec=2min
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/packages/bsp/common/lib/systemd/system/armbian-resize-filesystem.service b/packages/bsp/common/lib/systemd/system/armbian-resize-filesystem.service
index 3ac555f94..5c8117841 100644
--- a/packages/bsp/common/lib/systemd/system/armbian-resize-filesystem.service
+++ b/packages/bsp/common/lib/systemd/system/armbian-resize-filesystem.service
@@ -4,11 +4,9 @@
 
 [Unit]
 Description=Armbian filesystem resize
-Wants=first-boot-complete.target
-Before=basic.target first-boot-complete.target
+Before=basic.target
 After=sysinit.target local-fs.target
 DefaultDependencies=no
-ConditionFirstBoot=yes
 
 [Service]
 Type=oneshot
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
index a01caa210..975bafef2 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -56,7 +56,7 @@ case "$1" in
 	rm -f /etc/ssh/ssh_host*
 	read entropy_before </proc/sys/kernel/random/entropy_avail
 	dpkg-reconfigure openssh-server >/dev/null 2>&1
-
+	service sshd restart
 	read entropy_after </proc/sys/kernel/random/entropy_avail
 	echo -e "\n### [firstrun] Recreated SSH keys (entropy: ${entropy_before} ${entropy_after})" >>${Log}
 
@@ -129,7 +129,7 @@ case "$1" in
 	[[ $BRANCH == dev && $LINUXFAMILY == rockchip ]] && set_fixed_mac
 	[[ $BRANCH == current && $LINUXFAMILY == odroidc1 ]] && set_fixed_mac
 	[[ $LINUXFAMILY == meson64 ]] && set_fixed_mac
-
+	systemctl disable armbian-firstrun
 	exit 0
 	;;