diff --git a/.github/workflows/build_viewer.yml b/.github/workflows/build_viewer.yml
index dce5d85f28..8bc2ae7010 100644
--- a/.github/workflows/build_viewer.yml
+++ b/.github/workflows/build_viewer.yml
@@ -37,6 +37,11 @@ jobs:
           with:
             repository: FirestormViewer/fs-build-variables
             path: build-variables
+        
+        - name: set VSVER for Windows builds
+          if: runner.os == 'Windows'
+          run: echo "AUTOBUILD_VSVER=170" >> $GITHUB_ENV
+          shell: bash
 
         - name: Install required Ubuntu packages
           if: runner.os == 'Linux'
@@ -45,6 +50,9 @@ jobs:
         - name: install autobuild
           run: pip3 install git+https://github.com/Nicky-D/autobuild@main_nd
 
+        - name: install autobuild
+          run: pip3 install llbase
+
         - name: Configure
           run: autobuild configure -c ReleaseFS -A${{matrix.addrsize}} -- --package --chan ${{github.ref_name}} ${{env.EXTRA_ARGS}} ${{env.FS_GRID}}
           shell: bash
@@ -59,8 +67,8 @@ jobs:
           with:
             name: ${{ matrix.os }}-${{matrix.addrsize}}-${{matrix.grid}}-artifacts.zip
             path: |
-              build-vc150-*/newview/Release/*Setup.exe
-              build-vc150-*/newview/Release/*.xz
+              build-*/newview/Release/*Setup.exe
+              build-*/newview/Release/*.xz
 
         - name: publish ${{ matrix.os }} artifacts
           if: runner.os == 'Linux'
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index e961dbf99b..8431c04066 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -17,7 +17,7 @@ if (WINDOWS)
     foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
       # prefer more recent Python versions to older ones, if multiple versions
       # are installed
-      foreach(pyver 3.11 3.10 3.9 3.8 3.7)
+      foreach(pyver 3.11 3.10 3.9)
         list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
       endforeach()
     endforeach()
@@ -37,6 +37,7 @@ if (WINDOWS)
       "$ENV{PROGRAMFILES} (x86)/Python*"
       "c:/Python*")
 
+    set(Python3_FIND_REGISTRY "LAST")
     find_program(python
       NAMES python3.exe python.exe
       NO_DEFAULT_PATH # added so that cmake does not find cygwin python
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index c93d8bb875..0f98179ee3 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -359,7 +359,10 @@ then
     if [ "$OSTYPE" = "cygwin" ] ; then
         export AUTOBUILD_EXEC="$(cygpath -u $AUTOBUILD)"
     fi
-
+    if [ -z "$AUTOBUILD_EXEC" ]
+    then
+        export AUTOBUILD_EXEC=`which autobuild`
+    fi
     # load autobuild provided shell functions and variables
     eval "$("$AUTOBUILD_EXEC" source_environment)"
     # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake
@@ -605,9 +608,15 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
             make -j $JOBS | tee -a $LOG
         fi
     elif [ $TARGET_PLATFORM == "windows" ] ; then
-        msbuild.exe Firestorm.sln /p:Configuration=${BTYPE} /flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
-                    /flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" /p:Platform=${AUTOBUILD_WIN_VSPLATFORM} /t:Build /p:useenv=true \
-                    /verbosity:normal /toolsversion:15.0 /p:"VCBuildAdditionalOptions= /incremental"
+        if [ "${AUTOBUILD_VSVER}" -ge 170 ] ; then
+            msbuild.exe Firestorm.sln -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
+                -flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" -p:Platform=${AUTOBUILD_WIN_VSPLATFORM} -t:Build -p:useenv=true \
+                -verbosity:normal -toolsversion:Current -p:"VCBuildAdditionalOptions= /incremental"
+        else
+            msbuild.exe Firestorm.sln -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \
+                -flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" -p:Platform=${AUTOBUILD_WIN_VSPLATFORM} -t:Build -p:useenv=true \
+                -verbosity:normal -toolsversion:15.0 -p:"VCBuildAdditionalOptions= /incremental"
+        fi
     fi
 fi