diff --git a/.drone.yml b/.drone.yml
index fbc122df6..5c0ef3136 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -44,9 +44,19 @@ platform:
   arch: amd64
 
 steps:
-  - name: build
+  - name: init
     commands:
-      - utils/scripts/build/windows-build.ps1
+      - git submodule init
+      - git submodule update
+  - name: build-win-x64
+    commands:
+      - utils/scripts/build/windows-build-no-bots.ps1
+  - name: build-win-x64-bots
+    commands:
+      - utils/scripts/build/windows-build-bots.ps1
+  - name: package-artifacts
+    commands:
+      - utils/scripts/build/package-artifacts.ps1
 
 trigger:
   branch:
diff --git a/utils/scripts/build/package-artifacts.ps1 b/utils/scripts/build/package-artifacts.ps1
new file mode 100644
index 000000000..ebf9709ff
--- /dev/null
+++ b/utils/scripts/build/package-artifacts.ps1
@@ -0,0 +1,7 @@
+$cwd = Get-Location
+
+Set-Location -Path "$cwd"
+
+7z a build_x64.zip $cwd\build_x64\bin\RelWithDebInfo\*.exe $cwd\build_x64\bin\RelWithDebInfo\*.dll $cwd\build_x64\bin\RelWithDebInfo\*.pdb $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.pdb
+
+7z a build_bots_x64.zip $cwd\build_bots_x64\bin\RelWithDebInfo\*.exe $cwd\build_bots_x64\bin\RelWithDebInfo\*.dll $cwd\build_bots_x64\bin\RelWithDebInfo\*.pdb $cwd\build_bots_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_bots_x64\libs\zlibng\RelWithDebInfo\*.pdb
diff --git a/utils/scripts/build/windows-build.ps1 b/utils/scripts/build/windows-build-bots.ps1
similarity index 50%
rename from utils/scripts/build/windows-build.ps1
rename to utils/scripts/build/windows-build-bots.ps1
index 492634a48..53fdcf4a3 100644
--- a/utils/scripts/build/windows-build.ps1
+++ b/utils/scripts/build/windows-build-bots.ps1
@@ -2,28 +2,11 @@ $cwd = Get-Location
 
 Set-Location -Path "$cwd"
 
-git submodule init
-git submodule update
-
-Set-Location -Path $cwd
-
-if(![System.IO.Directory]::Exists("$cwd\build_x64")) {
-	Write-Information -MessageData "Creating build x64 folder" -InformationAction Continue
-	New-Item -Path "$cwd\build_x64" -ItemType Directory
-}
-
 if(![System.IO.Directory]::Exists("$cwd\build_bots_x64")) {
 	Write-Information -MessageData "Creating build (bots) x64 folder" -InformationAction Continue
 	New-Item -Path "$cwd\build_bots_x64" -ItemType Directory
 }
 
-Write-Information -MessageData "Creating no bots build x64" -InformationAction Continue
-Set-Location -Path "$cwd\build_x64"
-cmake -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=OFF "$cwd"
-cmake --build . --config RelWithDebInfo --clean-first
-Set-Location -Path "$cwd"
-7z a build_x64.zip $cwd\build_x64\bin\RelWithDebInfo\*.exe $cwd\build_x64\bin\RelWithDebInfo\*.dll $cwd\build_x64\bin\RelWithDebInfo\*.pdb $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.pdb
-
 Write-Information -MessageData "Creating bots build x64" -InformationAction Continue
 Set-Location -Path "$cwd\build_bots_x64"
 cmake -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=ON "$cwd"
diff --git a/utils/scripts/build/windows-build-no-bots.ps1 b/utils/scripts/build/windows-build-no-bots.ps1
new file mode 100644
index 000000000..7e4a862f1
--- /dev/null
+++ b/utils/scripts/build/windows-build-no-bots.ps1
@@ -0,0 +1,15 @@
+$cwd = Get-Location
+
+Set-Location -Path "$cwd"
+
+if(![System.IO.Directory]::Exists("$cwd\build_x64")) {
+	Write-Information -MessageData "Creating build x64 folder" -InformationAction Continue
+	New-Item -Path "$cwd\build_x64" -ItemType Directory
+}
+
+Write-Information -MessageData "Creating no bots build x64" -InformationAction Continue
+Set-Location -Path "$cwd\build_x64"
+cmake -Wno-dev -G "Visual Studio 17 2022" -A x64 -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=OFF "$cwd"
+cmake --build . --config RelWithDebInfo --clean-first
+Set-Location -Path "$cwd"
+7z a build_x64.zip $cwd\build_x64\bin\RelWithDebInfo\*.exe $cwd\build_x64\bin\RelWithDebInfo\*.dll $cwd\build_x64\bin\RelWithDebInfo\*.pdb $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.dll $cwd\build_x64\libs\zlibng\RelWithDebInfo\*.pdb