diff --git a/build_engine_mapping.json b/build_engine_mapping.json
index 2663e9c..de078eb 100644
--- a/build_engine_mapping.json
+++ b/build_engine_mapping.json
@@ -1,4 +1,6 @@
 {
   "vs-15-2017-win64-cxx17" : "Visual Studio 15 2017 Win64",
-  "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019"
+  "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019",
+  "windows-vs-16-2019-win64-cxx17" : "Visual Studio 16 2019",
+  "windows-vs-16-2019-win64" : "Visual Studio 16 2019"
 }
\ No newline at end of file
diff --git a/windows-vs-16-2019-win64-cxx17.cmake b/windows-vs-16-2019-win64-cxx17.cmake
new file mode 100644
index 0000000..0988018
--- /dev/null
+++ b/windows-vs-16-2019-win64-cxx17.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/vs-16-2019-win64-cxx17.cmake")
diff --git a/windows-vs-16-2019-win64.cmake b/windows-vs-16-2019-win64.cmake
new file mode 100644
index 0000000..0988018
--- /dev/null
+++ b/windows-vs-16-2019-win64.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/vs-16-2019-win64-cxx17.cmake")
diff --git a/vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-defender.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-defender.ps1
diff --git a/vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-update.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/disable-windows-update.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-update.ps1
diff --git a/vs-16-2019.pkr.js/scripts/fix-tls.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/fix-tls.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/fix-tls.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/fix-tls.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-git.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-git.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-git.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-git.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-nuget.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-nuget.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-nuget.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-nuget.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-openssh.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-openssh.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-openssh.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-openssh.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-tipi.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-tipi.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-tipi.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-tipi.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-vcredist.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-vcredist.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-vcredist.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-vcredist.ps1
diff --git a/vs-16-2019.pkr.js/scripts/install-vs.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-vs.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/install-vs.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/install-vs.ps1
diff --git a/vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/runtime/helpers.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/runtime/helpers.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/runtime/helpers.ps1
diff --git a/vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/runtime/sync-tipi-distro.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/runtime/sync-tipi-distro.ps1
diff --git a/vs-16-2019.pkr.js/scripts/setup-winrm.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/setup-winrm.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/setup-winrm.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/setup-winrm.ps1
diff --git a/vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/update-root-certificate-store.ps1
similarity index 100%
rename from vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1
rename to windows-vs-16-2019-win64.pkr.js/scripts/update-root-certificate-store.ps1
diff --git a/vs-16-2019.pkr.js/vs-16-2019.js.mustache b/windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache
similarity index 94%
rename from vs-16-2019.pkr.js/vs-16-2019.js.mustache
rename to windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache
index 47bfa2b..3a8b660 100644
--- a/vs-16-2019.pkr.js/vs-16-2019.js.mustache
+++ b/windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache
@@ -93,6 +93,13 @@
                 "./scripts/install-tipi.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "inline": [
+                "Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'",
+                "tipi run 'python get-pip.py'"
+            ]
+        },
         {
             "type": "powershell",
             "inline": [