diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..dfbc87594
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,58 @@
+stages:
+  - build
+  - deploy
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+build:staging:windows32:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A32 -- -DFMODSTUDIO=ON -DNVAPI=ON -DUSE_LTO=OFF -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN" -DVIEWER_CHANNEL_BASE:STRING="Alpha" -DPACKAGE=ON
+    - pipenv run autobuild build -c Release -A32 --no-configure
+    - sentry-cli upload-dif SingularityAlphaViewer.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll glod.dll
+  artifacts:
+    paths:
+      - build-vc-32/newview/Release/Singularity*Setup.exe
+  only:
+    refs:
+      - master
+      
+build:staging:windows64:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A64 -- -DFMODSTUDIO=ON -DNVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN" -DVIEWER_CHANNEL_BASE:STRING="Alpha" -DPACKAGE=ON
+    - pipenv run autobuild build -c Release -A64 --no-configure
+    - sentry-cli upload-dif SingularityAlphaViewer.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb libhunspell.dll libhunspell.pdb vcruntime140.dll msvcp140.dll glod.dll
+  artifacts:
+    paths:
+      - build-vc-64/newview/Release/Singularity*Setup.exe
+  only:
+    refs:
+      - master
+      
+deploy:staging:
+  stage: deploy
+  tags:
+    - autobuild
+    - windows
+  script:
+    - mkdir upload
+    - cp build-vc-*/newview/Release/Singularity*Setup.exe upload/
+    - $FileNameWin32 = Get-ChildItem -Path . -Name -Include upload/Singularity*_i686_Setup.exe
+    - curl.exe -v --user "$env:AUTOBUILD_HTTP_USER:$env:AUTOBUILD_HTTP_PASS" --upload-file ./$FileNameWin32 https://pkg.alchemyviewer.org/repository/singularity-project/alpha/$FileNameWin32
+    - $FileNameWin64 = Get-ChildItem -Path . -Name -Include upload/Singularity*_x86_64_Setup.exe
+    - curl.exe -v --user "$env:AUTOBUILD_HTTP_USER:$env:AUTOBUILD_HTTP_PASS" --upload-file ./$FileNameWin64 https://pkg.alchemyviewer.org/repository/singularity-project/alpha/$FileNameWin64
+  only:
+    - master
+
diff --git a/autobuild.xml b/autobuild.xml
index f5f17ea95..125c014e5 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2981,7 +2981,7 @@
         <key>windows</key>
         <map>
           <key>build_directory</key>
-          <string>build-vc${AUTOBUILD_WIN_VSVER|161}-$AUTOBUILD_ADDRSIZE</string>
+          <string>build-vc-$AUTOBUILD_ADDRSIZE</string>
           <key>configurations</key>
           <map>
             <key>RelWithDebInfo</key>
@@ -3040,6 +3040,7 @@
                   <string>/p:Configuration=Release</string>
                   <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
                   <string>/t:Build</string>
+                  <string>/p:PreferredToolArchitecture=x64</string>
                   <string>/p:useenv=true</string>
                   <string>/verbosity:normal</string>
                   <string>/m</string>
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 51e10a09a..b3b4fe7aa 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -87,7 +87,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
   set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "https://forge.alchemyviewer.org/alchemy/tools/Master-Message-Template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
+set(TEMPLATE_VERIFIER_MASTER_URL "https://git.alchemyviewer.org/alchemy/master-message-template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
 
 if (NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index b44410cdd..8d8c49fe0 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -229,7 +229,7 @@ http://wiki.secondlife.com/wiki/Template_verifier.py
 """)
     parser.add_option(
         '-u', '--master_url', type='string', dest='master_url',
-        default='http://bitbucket.org/lindenlab/master-message-template/raw/tip/message_template.msg',
+        default='http://git.alchemyviewer.org/alchemy/master-message-template/raw/master/message_template.msg',
         help="""The url of the master message template.""")
     parser.add_option(
         '-c', '--cache_master', action='store_true', dest='cache_master',