diff --git a/Makefile b/Makefile
index 7efb4d9..fc45661 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ full-install:
 	else \
 		echo "Invalid input. Skipping SpiriLink driver installation."; \
 	fi;
-	$(MAKE) spirilink-software
 	$(MAKE) configure-spirilink
+	$(MAKE) spirilink-software
 	$(MAKE) setup-webapp-service
 	$(MAKE) install-key
 	$(MAKE) setup-rtsp-service
@@ -55,8 +55,8 @@ manual-select:
 	@echo "[2] MAVLink Router"
 	@echo "[3] Python Dependencies"
 	@echo "[4] SpiriLink Driver"
-	@echo "[5] SpiriLink Software"
-	@echo "[6] Configure SpiriLink"
+	@echo "[5] Configure SpiriLink"
+	@echo "[6] SpiriLink Software"
 	@echo "[7] Setup WebApp Service"
 	@echo "[8] Install gs.key"
 	@echo "[9] Setup RTSP Service"
@@ -68,8 +68,8 @@ manual-select:
 		if [ "$$choice" = "2" ]; then $(MAKE) mavlink-router; fi; \
 		if [ "$$choice" = "3" ]; then $(MAKE) python-deps; fi; \
 		if [ "$$choice" = "4" ]; then $(MAKE) spirilink-driver; fi; \
-		if [ "$$choice" = "5" ]; then $(MAKE) spirilink-software; fi; \
-		if [ "$$choice" = "6" ]; then $(MAKE) configure-spirilink; fi; \
+		if [ "$$choice" = "5" ]; then $(MAKE) configure-spirilink; fi; \
+		if [ "$$choice" = "6" ]; then $(MAKE) spirilink-software; fi; \
 		if [ "$$choice" = "7" ]; then $(MAKE) setup-webapp-service; fi; \
 		if [ "$$choice" = "8" ]; then $(MAKE) install-key; fi; \
 		if [ "$$choice" = "9" ]; then $(MAKE) setup-rtsp-service; fi; \
@@ -105,6 +105,14 @@ dependencies:
 # Install SpiriLink driver 
 .PHONY: spirilink-driver
 spirilink-driver:
+	@read -p "Is SpiriLink using 8812EU or 8812AU? Enter EU/AU: " driver; \
+	if [ "$$driver" = "EU" ] || [ "$$driver" = "eu" ]; then \
+		$(MAKE) spirilink-driver DRIVER_TYPE=EU; \
+	elif [ "$$driver" = "AU" ] || [ "$$driver" = "au" ]; then \
+		$(MAKE) spirilink-driver DRIVER_TYPE=AU; \
+	else \
+		echo "Invalid input. Skipping SpiriLink driver installation."; \
+	fi;
 	$(SUDO) mkdir -p ~/tmp
 	@if [ "$(DRIVER_TYPE)" = "EU" ]; then \
 		echo "Installing SpiriLink 8812EU driver..."; \