diff --git a/.github/workflows/wheel-windows.yml b/.github/workflows/wheel-windows.yml
index b9437358b80b..bf342f0c2ac3 100644
--- a/.github/workflows/wheel-windows.yml
+++ b/.github/workflows/wheel-windows.yml
@@ -78,14 +78,11 @@ jobs:
     - name: Building libsumo plain
       if: matrix.build_type == 'libsumo'
       run: |
-        mkdir build_msvc
         cmake -Bbuild_msvc -GNinja -DCHECK_OPTIONAL_LIBS=false
         cmake --build build_msvc --config Release --target libsumo libtraci
         xcopy /s data .\tools\libsumo\data\
         python tools\build_config\version.py tools\build_config\setup-libsumo.py tools\setup.py
         python -m build --wheel tools -o dist --config-setting=--plat-name=win_amd64
-        python tools\build_config\version.py tools\build_config\setup-libtraci.py tools\setup.py
-        python -m build --wheel tools -o dist --config-setting=--plat-name=win_amd64
 
     - name: Building SUMO Wheels
       if: matrix.build_type == 'sumo'
diff --git a/tools/build_config/dailyBuildMSVC.py b/tools/build_config/dailyBuildMSVC.py
index 6967ea0f590a..561576d011eb 100755
--- a/tools/build_config/dailyBuildMSVC.py
+++ b/tools/build_config/dailyBuildMSVC.py
@@ -31,9 +31,11 @@
 import zipfile
 import shutil
 import sys
+import build
 
 import status
 import wix
+from version import filter_setup_py
 
 env = os.environ
 if "SUMO_HOME" not in env:
@@ -179,6 +181,14 @@ def main(options, platform="x64"):
     except Exception as e:
         status.printLog("Warning: Could not create nightly sumo-game.zip! (%s)" % e)
 
+    if options.suffix == "extra":
+        shutil.copy(os.path.join(SUMO_HOME, "build_config", "pyproject.toml"),
+                    os.path.join(SUMO_HOME, "pyproject.toml"))
+        filter_setup_py(os.path.join(SUMO_HOME, "build_config", "setup-sumo.py"), os.path.join(SUMO_HOME, "setup.py"))
+        build.ProjectBuilder(SUMO_HOME).build("wheel", {"--plat-name":"win_amd64"})
+        f = glob.glob(os.path.join(SUMO_HOME, "dist", "eclipse_sumo-*"))[0]
+        shutil.copy(f, os.path.join(options.remoteDir, f.replace("cp38-cp38", "py2.py3-none")))
+
     debug_handler = status.set_rotating_log(makeAllLog, log_handler)
     ret = status.log_subprocess(["cmake", "--build", ".", "--config", "Debug"], cwd=buildDir)
     if ret == 0: