diff --git a/config.sh b/config.sh
index d5c3c92..c4dcc71 100755
--- a/config.sh
+++ b/config.sh
@@ -341,15 +341,6 @@ enabled=0
 gpgcheck=0
 EOF
 
-	if [[ "$kiwi_profiles" == *"RISCVServer"* ]]; then
-	# Disable tmpfs for /tmp
-	# Most boards don't have a lot of RAM.
-	systemctl mask tmp.mount
-
-	# We most likely don't have HW random number generator
-	systemctl enable haveged.service
-	fi
-
 	# Update login message
 	cat << EOF | tee /etc/issue /etc/issue.net
 Welcome to the Fedora/RISC-V disk image
@@ -376,6 +367,14 @@ Koji internal rep.: http://fedora.riscv.rocks/repos/
 
 EOF
 
+	if [[ "$kiwi_profiles" == *"RISCVServer"* ]]; then
+	# Disable tmpfs for /tmp
+	# Most boards don't have a lot of RAM.
+	systemctl mask tmp.mount
+
+	# We most likely don't have HW random number generator
+	systemctl enable haveged.service
+
 	# Setup toolbox container to use
 	cat << EOF | tee -a /etc/containers/toolbox.conf
 image = "fedora.riscv.rocks:3000/davidlt/fedora-toolbox:41"
@@ -390,8 +389,7 @@ EOF
 
 	# Add Fedora/RISCV registry for search
 	sed -i -r 's/(unqualified-search-registries = \[")/\1fedora.riscv.rocks:3000", "/' /etc/containers/registries.conf
-
-
+	fi # RISCVServer
 fi
 
 exit 0