diff --git a/install.sh b/install.sh
index 738a6c5..f331c33 100755
--- a/install.sh
+++ b/install.sh
@@ -466,6 +466,65 @@ if [ "$SMARTHOST_PROXY" == "yes" ]; then
 	fi
 fi
 
+
+# install additionals - run installer-tool again but additional_install.sh instead of deploy.sh
+echo "Would you like to install additional applications? (Y/n)";
+read -r ANSWER;
+if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
+
+	ask_additionals;
+
+	if [ "$NEXTCLOUD" != "" ]; then
+		VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD";
+		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
+		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
+		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD";
+
+		if [ ! -d "/etc/user/data/nextcloud" ]; then
+			$SUDO_CMD mkdir -p "/etc/user/data/nextcloud"
+			$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud"
+		fi;
+	
+	ADDITIONAL_SERVICES="";
+	echo "Would you like to run Nextcloud after install? (Y/n)";
+	read -r ANSWER;
+		if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
+			ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES nextcloud";
+		fi
+	fi
+	
+	if [ "$BITWARDEN" != "" ]; then
+		VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
+		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
+	
+		echo "You can access your bitwarden admin page here: https://$BITWARDEN_DOMAIN/admin";
+		echo "You will find ADMIN TOKEN in this file: /etc/user/secret/bitwarden-secret.json";
+		echo "Would you like to run Nextcloud after install? (Y/n)";
+		read -r ANSWER;
+		if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
+			ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES bitwarden";
+		fi
+	fi
+
+	# Run installer tool
+	$SUDO_CMD docker run \
+	--env ADDITIONALS=true \
+	--env SERVICE_DIR=$SERVICE_DIR\
+	$VAR_NEXTCLOUD \
+	$VAR_BITWARDEN \
+	--volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
+	--volume /etc/user/:/etc/user/ \
+	--volume /etc/system/:/etc/system/ \
+	registry.format.hu/installer-tool
+		
+		if [ "$ADDITIONAL_SERVICE" != "" ]; then 
+			for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do
+				service-debian $ADDITIONAL_SERVICE start
+				echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $PWD/.init_services
+			done
+		fi
+fi
+
 if [ "$DISCOVERY" == "yes" ] ; then
 	$SUDO_CMD chmod a+x $DISCOVERY_DIR/service-discovery.sh
 	$DISCOVERY_DIR/service-discovery.sh $DISCOVERY_CONFIG_FILE;
@@ -530,43 +589,3 @@ fi;
 
 rm $PWD/.init_services
 
-# install additionals - run installer-tool again but additional_install.sh instead of deploy.sh
-echo "Would you like to install additional applications? (Y/n)";
-read -r ANSWER;
-if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
-
-	ask_additionals;
-
-	if [ "$NEXTCLOUD" != "" ]; then
-		VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD";
-		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
-		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
-		VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD";
-
-		if [ ! -d "/etc/user/data/nextcloud" ]; then
-			$SUDO_CMD mkdir -p "/etc/user/data/nextcloud"
-			$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud"
-		fi;
-	fi
-	if [ "$BITWARDEN" != "" ]; then
-		VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
-		VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
-	
-		echo "You can access your bitwarden admin page here: https://$BITWARDEN_DOMAIN/admin";
-		echo "You will find ADMIN TOKEN in this file: /etc/user/secret/bitwarden-secret.json";
-	fi
-
-	# Run installer tool
-	$SUDO_CMD docker run \
-	--env ADDITIONALS=true \
-	--env SERVICE_DIR=$SERVICE_DIR\
-	$VAR_NEXTCLOUD \
-	$VAR_BITWARDEN \
-	--volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
-	--volume /etc/user/:/etc/user/ \
-	--volume /etc/system/:/etc/system/ \
-	registry.format.hu/installer-tool
-
-fi
-
-