diff --git a/deploy/FortFirewall.iss b/deploy/FortFirewall.iss
index 7b7c9481..a4c5ed6a 100644
--- a/deploy/FortFirewall.iss
+++ b/deploy/FortFirewall.iss
@@ -90,8 +90,8 @@ Filename: "{app}\driver\scripts\uninstall.bat"; RunOnceId: "DelDriver"
 [InstallDelete]
 Type: filesandordirs; Name: "{app}\driver"
 Type: filesandordirs; Name: "{app}\i18n"
+; TODO: COMPAT: Remove the following 3 lines after v4.1.0
 Type: filesandordirs; Name: "{app}\plugins"
-; TODO: COMPAT: Remove the following line after v4.1.0
 Type: files; Name: "{app}\curl*.*"
 Type: files; Name: "{app}\qt*.*"
 Type: files; Name: "{app}\README*.*"
diff --git a/deploy/deployment.json b/deploy/deployment.json
index b530da3e..880b37b1 100644
--- a/deploy/deployment.json
+++ b/deploy/deployment.json
@@ -1,12 +1,6 @@
 {
 	"files": {
 		"${TARGET}": {
-			"qt": [
-				"${QTPATH}/bin/Qt6Core.dll",
-				"${QTPATH}/bin/Qt6Gui.dll",
-				"${QTPATH}/bin/Qt6Network.dll",
-				"${QTPATH}/bin/Qt6Widgets.dll"
-			],
 			"fort": [
 				"${BUILD}/ui_bin/FortFirewall.exe",
 				"${ROOT}/ChangeLog",
@@ -14,23 +8,15 @@
 			]
 		},
 		"${TARGET}/driver": {
-			"driver-x32 | win7": [
+			"x86 | win7": [
 				"${BUILD}-driver-${CONFIG}/fortfw32.sys"
 			],
-			"driver-x64": [
+			"x86_64": [
 				"${BUILD}-driver-${CONFIG}/fortfw64.sys"
 			],
 			"scripts": [
 				"${ROOT}/src/driver/scripts		| *.bat *.lnk		|"
 			]
-		},
-		"${TARGET}/plugins": {
-			"qt": [
-				"${QTPATH}/plugins/platforms		| qwindows.dll		| *d.dll"
-			],
-			"qt-tls | win10": [
-				"${QTPATH}/plugins/tls			| qschannelbackend.dll	| *dd.dll"
-			]
 		}
 	}
 }
diff --git a/deploy/qt-build.bat b/deploy/qt-build.bat
index 3b81b674..b585da48 100644
--- a/deploy/qt-build.bat
+++ b/deploy/qt-build.bat
@@ -11,8 +11,11 @@
 md %TARGET_PATH%
 cd %TARGET_PATH%
 
-%QT_PATH%/configure -release -force-debug-info -optimize-size -opensource -confirm-license ^
-	-mp -no-opengl -nomake examples -nomake tests -nomake tools ^
+%QT_PATH%/configure -release -force-debug-info -optimize-size ^
+	-static -prefix "%TARGET_PATH%\static" ^
+	-opensource -confirm-license -mp -no-opengl ^
+	^
+	-nomake examples -nomake tests -nomake tools ^
 	^
 	-skip qt3d -skip qt5compat -skip qtactiveqt -skip qtandroidextras ^
 	-skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d ^
@@ -55,3 +58,4 @@ cd %TARGET_PATH%
 	-no-feature-dbus -no-feature-vulkan -no-feature-vkgen
 
 cmake --build . --parallel
+cmake --install .
diff --git a/deploy/qt/qt.conf b/deploy/qt/qt.conf
deleted file mode 100644
index 0fa983f3..00000000
--- a/deploy/qt/qt.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[Paths]
-Binaries = .
-LibraryExecutables = .
-Plugins = plugins
-Translations = i18n
-Imports = imports
-Qml2Imports = imports
diff --git a/deploy/setup-deployment-win10.bat b/deploy/setup-deployment-win10.bat
index 4a5214b5..15f6c400 100644
--- a/deploy/setup-deployment-win10.bat
+++ b/deploy/setup-deployment-win10.bat
@@ -1 +1 @@
-@%~dp0setup-deployment.bat -QtPath ".\build-qt\qtbase" -Config win10
+@%~dp0setup-deployment.bat -Config win10
diff --git a/deploy/setup-deployment-win7.bat b/deploy/setup-deployment-win7.bat
index 3f89da92..e0153de1 100644
--- a/deploy/setup-deployment-win7.bat
+++ b/deploy/setup-deployment-win7.bat
@@ -1 +1 @@
-@%~dp0setup-deployment.bat -QtPath ".\build-qt-win7\qtbase" -Config win7
+@%~dp0setup-deployment.bat -Config win7
diff --git a/deploy/setup-deployment.bat b/deploy/setup-deployment.bat
index 176f9563..53fcda40 100644
--- a/deploy/setup-deployment.bat
+++ b/deploy/setup-deployment.bat
@@ -3,12 +3,7 @@
 
 @set TARGET_PATH=build
 
+rd /Q /S %TARGET_PATH%
 md %TARGET_PATH%
-cd %TARGET_PATH%
-del /Q /F qt*.* FortFirewall.exe
-rd /Q /S driver i18n imports plugins
-cd ..
 
 powershell.exe -executionpolicy remotesigned -file setup-deployment.ps1 %TARGET_PATH% %*
-
-xcopy /Q /S /Y qt %TARGET_PATH%\