diff --git a/live-build/auto/config b/live-build/auto/config
index d78f6a54..bf7435d7 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -549,6 +549,11 @@ case $PROJECT in
 			add_task install minimal standard cloud-image
 			add_package install ubuntu-minimal
 			KERNEL_FLAVOURS=virtual
+		        case $ARCH in
+				armhf|arm64|ppc64el|powerpc)
+					add_task install server
+					;;
+			esac
 		fi
 
 		BINARY_REMOVE_LINUX=false
@@ -557,17 +562,9 @@ case $PROJECT in
 			armhf)
 				KERNEL_FLAVOURS=generic-lpae
 				add_package install flash-kernel
-				add_task install server
 				;;
 			arm64)
 				add_package install flash-kernel
-				add_task install server
-				;;
-			ppc64el)
-				add_task install server
-				;;
-			powerpc)
-				add_task install server
 				;;
 		esac
 		OPTS="${OPTS:+$OPTS }--system=normal"