diff --git a/README.md b/README.md
index 5fcf41d76..fc58cce7a 100644
--- a/README.md
+++ b/README.md
@@ -59,24 +59,24 @@ The following Vagrant boxes can be used for generic experiments on the respectiv
 
 ##### Windows Server
 
-- [Windows Server **all versions**][windows-server-all-box]
+- [Windows Server **latest version**][windows-server-latest-box]
 - [Windows Server **2016** and **2019** **Standard**][windows-server-standard-box]
 - [Windows Server **2016** and **2019** **Standard Core**][windows-server-standard-core-box]
-- [Windows Server **Insider Preview** **Standard Core**][windows-server-standard-core-insider-preview-box]
+- [Windows Server **Standard Core** **Insider Preview**][windows-server-standard-core-insider-preview-box]
 
-[windows-server-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-server/
+[windows-server-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-server/
 [windows-server-standard-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-server-standard/
 [windows-server-standard-core-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-server-standard-core/
 [windows-server-standard-core-insider-preview-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-server-standard-core-insider-preview/
 
 ##### Windows 10
 
-- [Windows 10 **all versions**][windows-10-all-box]
-- [Windows 10 Version **1809** **Enterprise LTSC**][windows-10-enterprise-ltsc-box]
+- [Windows 10 **latest version**][windows-10-latest-box]
+- [Windows 10 Version **1809** **Enterprise** **LTSC**][windows-10-enterprise-ltsc-box]
 - [Windows 10 Version **1909** and **2004** **Enterprise**][windows-10-enterprise-box]
-- [Windows 10 **Insider Preview** **Enterprise**][windows-10-enterprise-insider-preview-box]
+- [Windows 10 **Enterprise** **Insider Preview**][windows-10-enterprise-insider-preview-box]
 
-[windows-10-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-10/
+[windows-10-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-10/
 [windows-10-enterprise-ltsc-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-10-enterprise-ltsc/
 [windows-10-enterprise-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-10-enterprise/
 [windows-10-enterprise-insider-preview-box]: https://app.vagrantup.com/gusztavvargadr/boxes/windows-10-enterprise-insider-preview/
@@ -87,18 +87,18 @@ The following Vagrant boxes can be used for generic experiments on the respectiv
 
 ##### Ubuntu Server
 
-- [Ubuntu Server **all versions**][ubuntu-server-all-box]
+- [Ubuntu Server **latest version**][ubuntu-server-latest-box]
 - [Ubuntu Server **16.04** **LTS**][ubuntu-server-lts-box]
 
-[ubuntu-server-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server/
+[ubuntu-server-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server/
 [ubuntu-server-lts-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-server-lts/
 
 ##### Ubuntu Desktop
 
-- [Ubuntu Desktop **all versions**][ubuntu-desktop-all-box]
-- [Ubuntu Desktop **16.04** **LTS** with **XFCE**][ubuntu-desktop-xfce-lts-box]
+- [Ubuntu Desktop **latest version**][ubuntu-desktop-latest-box]
+- [Ubuntu Desktop **16.04** **XFCE** **LTS**][ubuntu-desktop-xfce-lts-box]
 
-[ubuntu-desktop-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop/
+[ubuntu-desktop-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop/
 [ubuntu-desktop-xfce-lts-box]: https://app.vagrantup.com/gusztavvargadr/boxes/ubuntu-desktop-xfce-lts/
 
 ### Hosting
@@ -113,46 +113,46 @@ The following Vagrant boxes can be used for hosting scenarios. They contain the
 
 ##### Docker Windows
 
-- [Docker Windows **all versions**][docker-windows-all-box]
+- [Docker Windows **latest version**][docker-windows-latest-box]
 - [Docker Windows **19.03** **Enterprise** on **Windows Server**][docker-windows-enterprise-windows-server-box]
 - [Docker Windows **19.03** **Enterprise** on **Windows Server Core**][docker-windows-enterprise-windows-server-core-box]
 
-[docker-windows-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-windows/
+[docker-windows-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-windows/
 [docker-windows-enterprise-windows-server-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-windows-enterprise-windows-server/
 [docker-windows-enterprise-windows-server-core-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-windows-enterprise-windows-server-core/
 
 ##### Docker Linux
 
-- [Docker Linux **all versions**][docker-linux-all-box]
+- [Docker Linux **latest version**][docker-linux-latest-box]
 - [Docker Linux **19.03** **Community** on **Windows 10**][docker-linux-community-windows-10-box]
 - [Docker Linux **19.03** **Community** on **Ubuntu Server**][docker-linux-community-ubuntu-server-box]
 - [Docker Linux **19.03** **Community** on **Ubuntu Desktop**][docker-linux-community-ubuntu-desktop-box]
 
-[docker-linux-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-linux/
+[docker-linux-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-linux/
 [docker-linux-community-windows-10-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-linux-community-windows-10/
 [docker-linux-community-ubuntu-server-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-linux-community-ubuntu-server/
 [docker-linux-community-ubuntu-desktop-box]: https://app.vagrantup.com/gusztavvargadr/boxes/docker-linux-community-ubuntu-desktop/
 
 #### IIS
 
-- [IIS **all versions**][iis-all-box]
+- [IIS **latest version**][iis-latest-box]
 - [IIS **10.0** on **Windows Server**][iis-windows-server-box]
 - [IIS **10.0** on **Windows Server Core**][iis-windows-server-core-box]
 
 [IIS]: #iis
 
-[iis-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/iis/
+[iis-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/iis/
 [iis-windows-server-box]: https://app.vagrantup.com/gusztavvargadr/boxes/iis-windows-server/
 [iis-windows-server-core-box]: https://app.vagrantup.com/gusztavvargadr/boxes/iis-windows-server-core/
 
 #### SQL Server
 
-- [SQL Server **all versions**][sql-server-all-box]
+- [SQL Server **latest version**][sql-server-latest-box]
 - [SQL Server **2017** and **2019** **Developer** on **Windows Server**][sql-server-developer-windows-server-box]
 
 [SQL Server]: #sql-server
 
-[sql-server-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/sql-server/
+[sql-server-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/sql-server/
 [sql-server-developer-windows-server-box]: https://app.vagrantup.com/gusztavvargadr/boxes/sql-server-developer-windows-server/
 
 ### Development
@@ -163,13 +163,13 @@ The following Vagrant boxes can be used for development scenarios including sett
 
 #### Visual Studio
 
-- [Visual Studio **all versions**][visual-studio-all-box]
+- [Visual Studio **latest version**][visual-studio-latest-box]
 - [Visual Studio **2017** and **2019** **Community** on **Windows 10**][visual-studio-community-windows-10-box]
 - [Visual Studio **2017** and **2019** **Professional** on **Windows 10**][visual-studio-professional-windows-10-box]
 
 [Visual Studio]: #visual-studio
 
-[visual-studio-all-box]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio/
+[visual-studio-latest-box]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio/
 [visual-studio-community-windows-10-box]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio-community-windows-10/
 [visual-studio-professional-windows-10-box]: https://app.vagrantup.com/gusztavvargadr/boxes/visual-studio-professional-windows-10/
 
diff --git a/Vagrantfile b/Vagrantfile
index fc202fcd1..efc1995ab 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@ directory = File.dirname(__FILE__)
 require "#{directory}/src/vagrant"
 
 def version
-  '2007'
+  '2008'
 end
 
 VagrantMachine.defaults_include(
diff --git a/build.cake b/build.cake
index 72e6127c3..3b9858b4f 100644
--- a/build.cake
+++ b/build.cake
@@ -2,7 +2,7 @@
 
 var target = Argument("target", "default");
 var configuration = Argument("configuration", string.Empty);
-var version = "2007";
+var version = "2008";
 
 var buildDirectory = Argument("build-directory", EnvironmentVariable("PACKER_BUILD_DIR") ?? "./build");
 PackerTemplate.BuildDirectory = buildDirectory;
diff --git a/src/core/azp/cd-stages.yml b/src/core/azp/cd-stages.yml
index bbf534545..2d61e6f97 100644
--- a/src/core/azp/cd-stages.yml
+++ b/src/core/azp/cd-stages.yml
@@ -6,6 +6,7 @@ parameters:
 stages:
   - stage: cd
     displayName: CD
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
 
     jobs:
       - job: publish
diff --git a/src/core/azp/docker-linux/u1604d-dc/hyperv-vagrant.yml b/src/core/azp/docker-linux/u1604d-dc/hyperv-vagrant.yml
index db36edc7b..03654b6c1 100644
--- a/src/core/azp/docker-linux/u1604d-dc/hyperv-vagrant.yml
+++ b/src/core/azp/docker-linux/u1604d-dc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-linux/u1604d-dc/virtualbox-vagrant.yml b/src/core/azp/docker-linux/u1604d-dc/virtualbox-vagrant.yml
index 09fbc760f..9bf175502 100644
--- a/src/core/azp/docker-linux/u1604d-dc/virtualbox-vagrant.yml
+++ b/src/core/azp/docker-linux/u1604d-dc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-linux/u1604s-dc/hyperv-vagrant.yml b/src/core/azp/docker-linux/u1604s-dc/hyperv-vagrant.yml
index 894645e00..dfc7eacdf 100644
--- a/src/core/azp/docker-linux/u1604s-dc/hyperv-vagrant.yml
+++ b/src/core/azp/docker-linux/u1604s-dc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-linux/u1604s-dc/virtualbox-vagrant.yml b/src/core/azp/docker-linux/u1604s-dc/virtualbox-vagrant.yml
index 84c99513c..95b8f1ae2 100644
--- a/src/core/azp/docker-linux/u1604s-dc/virtualbox-vagrant.yml
+++ b/src/core/azp/docker-linux/u1604s-dc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-linux/w102004e-dc/hyperv-vagrant.yml b/src/core/azp/docker-linux/w102004e-dc/hyperv-vagrant.yml
index bc87f4359..dd87e3fc0 100644
--- a/src/core/azp/docker-linux/w102004e-dc/hyperv-vagrant.yml
+++ b/src/core/azp/docker-linux/w102004e-dc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-linux/w102004e-dc/virtualbox-vagrant.yml b/src/core/azp/docker-linux/w102004e-dc/virtualbox-vagrant.yml
index 58fc85a16..6bf453c35 100644
--- a/src/core/azp/docker-linux/w102004e-dc/virtualbox-vagrant.yml
+++ b/src/core/azp/docker-linux/w102004e-dc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-windows/ws2019s-de/hyperv-vagrant.yml b/src/core/azp/docker-windows/ws2019s-de/hyperv-vagrant.yml
index 744154f2e..3a186ecb7 100644
--- a/src/core/azp/docker-windows/ws2019s-de/hyperv-vagrant.yml
+++ b/src/core/azp/docker-windows/ws2019s-de/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-windows/ws2019s-de/virtualbox-vagrant.yml b/src/core/azp/docker-windows/ws2019s-de/virtualbox-vagrant.yml
index fbfe273b3..5a9fc7e49 100644
--- a/src/core/azp/docker-windows/ws2019s-de/virtualbox-vagrant.yml
+++ b/src/core/azp/docker-windows/ws2019s-de/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-windows/ws2019sc-de/hyperv-vagrant.yml b/src/core/azp/docker-windows/ws2019sc-de/hyperv-vagrant.yml
index ea3e9a2b7..0a751560d 100644
--- a/src/core/azp/docker-windows/ws2019sc-de/hyperv-vagrant.yml
+++ b/src/core/azp/docker-windows/ws2019sc-de/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/docker-windows/ws2019sc-de/virtualbox-vagrant.yml b/src/core/azp/docker-windows/ws2019sc-de/virtualbox-vagrant.yml
index 6e4afc32e..017032f3a 100644
--- a/src/core/azp/docker-windows/ws2019sc-de/virtualbox-vagrant.yml
+++ b/src/core/azp/docker-windows/ws2019sc-de/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/iis/ws2019s-iis/hyperv-vagrant.yml b/src/core/azp/iis/ws2019s-iis/hyperv-vagrant.yml
index d400130f4..0988383fc 100644
--- a/src/core/azp/iis/ws2019s-iis/hyperv-vagrant.yml
+++ b/src/core/azp/iis/ws2019s-iis/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/iis/ws2019s-iis/virtualbox-vagrant.yml b/src/core/azp/iis/ws2019s-iis/virtualbox-vagrant.yml
index b544843f7..259745736 100644
--- a/src/core/azp/iis/ws2019s-iis/virtualbox-vagrant.yml
+++ b/src/core/azp/iis/ws2019s-iis/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/iis/ws2019sc-iis/hyperv-vagrant.yml b/src/core/azp/iis/ws2019sc-iis/hyperv-vagrant.yml
index cf2c1b472..e5885cf0e 100644
--- a/src/core/azp/iis/ws2019sc-iis/hyperv-vagrant.yml
+++ b/src/core/azp/iis/ws2019sc-iis/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/iis/ws2019sc-iis/virtualbox-vagrant.yml b/src/core/azp/iis/ws2019sc-iis/virtualbox-vagrant.yml
index a54a9aed1..4d8220f88 100644
--- a/src/core/azp/iis/ws2019sc-iis/virtualbox-vagrant.yml
+++ b/src/core/azp/iis/ws2019sc-iis/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/sql-server/ws2019s-sql17d/hyperv-vagrant.yml b/src/core/azp/sql-server/ws2019s-sql17d/hyperv-vagrant.yml
index f80a8125b..bd7792008 100644
--- a/src/core/azp/sql-server/ws2019s-sql17d/hyperv-vagrant.yml
+++ b/src/core/azp/sql-server/ws2019s-sql17d/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/sql-server/ws2019s-sql17d/virtualbox-vagrant.yml b/src/core/azp/sql-server/ws2019s-sql17d/virtualbox-vagrant.yml
index 0d509d48b..83b7b71e2 100644
--- a/src/core/azp/sql-server/ws2019s-sql17d/virtualbox-vagrant.yml
+++ b/src/core/azp/sql-server/ws2019s-sql17d/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/sql-server/ws2019s-sql19d/hyperv-vagrant.yml b/src/core/azp/sql-server/ws2019s-sql19d/hyperv-vagrant.yml
index 7d1fbe1d9..5a62a8d74 100644
--- a/src/core/azp/sql-server/ws2019s-sql19d/hyperv-vagrant.yml
+++ b/src/core/azp/sql-server/ws2019s-sql19d/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/sql-server/ws2019s-sql19d/virtualbox-vagrant.yml b/src/core/azp/sql-server/ws2019s-sql19d/virtualbox-vagrant.yml
index 8787fbb8d..bf9f22e9f 100644
--- a/src/core/azp/sql-server/ws2019s-sql19d/virtualbox-vagrant.yml
+++ b/src/core/azp/sql-server/ws2019s-sql19d/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/ubuntu/u1604d/hyperv-vagrant.yml b/src/core/azp/ubuntu/u1604d/hyperv-vagrant.yml
index 5715bcaa3..f448da7a6 100644
--- a/src/core/azp/ubuntu/u1604d/hyperv-vagrant.yml
+++ b/src/core/azp/ubuntu/u1604d/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/ubuntu/u1604d/virtualbox-vagrant.yml b/src/core/azp/ubuntu/u1604d/virtualbox-vagrant.yml
index 15eeee0dd..1b5910d1d 100644
--- a/src/core/azp/ubuntu/u1604d/virtualbox-vagrant.yml
+++ b/src/core/azp/ubuntu/u1604d/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/ubuntu/u1604s/hyperv-vagrant.yml b/src/core/azp/ubuntu/u1604s/hyperv-vagrant.yml
index 9b369a9ed..9ed9dad85 100644
--- a/src/core/azp/ubuntu/u1604s/hyperv-vagrant.yml
+++ b/src/core/azp/ubuntu/u1604s/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/ubuntu/u1604s/virtualbox-vagrant.yml b/src/core/azp/ubuntu/u1604s/virtualbox-vagrant.yml
index ee83e5da3..15582b878 100644
--- a/src/core/azp/ubuntu/u1604s/virtualbox-vagrant.yml
+++ b/src/core/azp/ubuntu/u1604s/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs17c/hyperv-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs17c/hyperv-vagrant.yml
index 320bea76c..2658e4634 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs17c/hyperv-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs17c/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs17c/virtualbox-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs17c/virtualbox-vagrant.yml
index 4c560e83e..45a043a2f 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs17c/virtualbox-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs17c/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs17p/hyperv-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs17p/hyperv-vagrant.yml
index 0a1763591..b219ea2f6 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs17p/hyperv-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs17p/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs17p/virtualbox-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs17p/virtualbox-vagrant.yml
index d32308433..e8c877cc5 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs17p/virtualbox-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs17p/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs19c/hyperv-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs19c/hyperv-vagrant.yml
index 3bf28bc75..3f54b2753 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs19c/hyperv-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs19c/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs19c/virtualbox-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs19c/virtualbox-vagrant.yml
index f4612bb42..5b9028bd1 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs19c/virtualbox-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs19c/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs19p/hyperv-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs19p/hyperv-vagrant.yml
index 5a92cfe44..475498f11 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs19p/hyperv-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs19p/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/visual-studio/w102004e-dc-vs19p/virtualbox-vagrant.yml b/src/core/azp/visual-studio/w102004e-dc-vs19p/virtualbox-vagrant.yml
index f7a4e0072..017d4fa39 100644
--- a/src/core/azp/visual-studio/w102004e-dc-vs19p/virtualbox-vagrant.yml
+++ b/src/core/azp/visual-studio/w102004e-dc-vs19p/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w101809eltsc/hyperv-vagrant.yml b/src/core/azp/windows-10/w101809eltsc/hyperv-vagrant.yml
index 9494bcd97..fa2507b6e 100644
--- a/src/core/azp/windows-10/w101809eltsc/hyperv-vagrant.yml
+++ b/src/core/azp/windows-10/w101809eltsc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w101809eltsc/virtualbox-vagrant.yml b/src/core/azp/windows-10/w101809eltsc/virtualbox-vagrant.yml
index 98d12f87b..f6a2dfbe0 100644
--- a/src/core/azp/windows-10/w101809eltsc/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-10/w101809eltsc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w101909e/hyperv-vagrant.yml b/src/core/azp/windows-10/w101909e/hyperv-vagrant.yml
index d916a6a0f..5ccc8b354 100644
--- a/src/core/azp/windows-10/w101909e/hyperv-vagrant.yml
+++ b/src/core/azp/windows-10/w101909e/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w101909e/virtualbox-vagrant.yml b/src/core/azp/windows-10/w101909e/virtualbox-vagrant.yml
index 11fbed32f..d26ed821f 100644
--- a/src/core/azp/windows-10/w101909e/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-10/w101909e/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w102004e/hyperv-vagrant.yml b/src/core/azp/windows-10/w102004e/hyperv-vagrant.yml
index 5c3884514..76b394c1e 100644
--- a/src/core/azp/windows-10/w102004e/hyperv-vagrant.yml
+++ b/src/core/azp/windows-10/w102004e/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w102004e/virtualbox-vagrant.yml b/src/core/azp/windows-10/w102004e/virtualbox-vagrant.yml
index 16a12fd01..c347381dd 100644
--- a/src/core/azp/windows-10/w102004e/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-10/w102004e/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w10ipe/hyperv-vagrant.yml b/src/core/azp/windows-10/w10ipe/hyperv-vagrant.yml
index 7c76e65eb..d2689b73d 100644
--- a/src/core/azp/windows-10/w10ipe/hyperv-vagrant.yml
+++ b/src/core/azp/windows-10/w10ipe/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-10/w10ipe/virtualbox-vagrant.yml b/src/core/azp/windows-10/w10ipe/virtualbox-vagrant.yml
index 6bbb9bdd8..530843081 100644
--- a/src/core/azp/windows-10/w10ipe/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-10/w10ipe/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2016s/hyperv-vagrant.yml b/src/core/azp/windows-server/ws2016s/hyperv-vagrant.yml
index 91a015d75..b11da597d 100644
--- a/src/core/azp/windows-server/ws2016s/hyperv-vagrant.yml
+++ b/src/core/azp/windows-server/ws2016s/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2016s/virtualbox-vagrant.yml b/src/core/azp/windows-server/ws2016s/virtualbox-vagrant.yml
index 304302746..54e275017 100644
--- a/src/core/azp/windows-server/ws2016s/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-server/ws2016s/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2016sc/hyperv-vagrant.yml b/src/core/azp/windows-server/ws2016sc/hyperv-vagrant.yml
index e52c0a87b..df698ab71 100644
--- a/src/core/azp/windows-server/ws2016sc/hyperv-vagrant.yml
+++ b/src/core/azp/windows-server/ws2016sc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2016sc/virtualbox-vagrant.yml b/src/core/azp/windows-server/ws2016sc/virtualbox-vagrant.yml
index 1484e6a98..d6dde0f02 100644
--- a/src/core/azp/windows-server/ws2016sc/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-server/ws2016sc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2019s/hyperv-vagrant.yml b/src/core/azp/windows-server/ws2019s/hyperv-vagrant.yml
index 2d8776867..f6fe84b27 100644
--- a/src/core/azp/windows-server/ws2019s/hyperv-vagrant.yml
+++ b/src/core/azp/windows-server/ws2019s/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2019s/virtualbox-vagrant.yml b/src/core/azp/windows-server/ws2019s/virtualbox-vagrant.yml
index 3d9ea513b..62e748882 100644
--- a/src/core/azp/windows-server/ws2019s/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-server/ws2019s/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2019sc/hyperv-vagrant.yml b/src/core/azp/windows-server/ws2019sc/hyperv-vagrant.yml
index f76312d29..72672ccbd 100644
--- a/src/core/azp/windows-server/ws2019sc/hyperv-vagrant.yml
+++ b/src/core/azp/windows-server/ws2019sc/hyperv-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/azp/windows-server/ws2019sc/virtualbox-vagrant.yml b/src/core/azp/windows-server/ws2019sc/virtualbox-vagrant.yml
index a92cf6a3e..dc8d80316 100644
--- a/src/core/azp/windows-server/ws2019sc/virtualbox-vagrant.yml
+++ b/src/core/azp/windows-server/ws2019sc/virtualbox-vagrant.yml
@@ -8,7 +8,7 @@ resources:
       trigger:
         branches:
           include:
-            - master
+            - '*'
 
 stages:
   - template: ../../ci-stages.yml
diff --git a/src/core/packet/azp-agent-host.install.ps1 b/src/core/packet/azp-agent-host.install.ps1
index 33789ebd6..01174ffe0 100644
--- a/src/core/packet/azp-agent-host.install.ps1
+++ b/src/core/packet/azp-agent-host.install.ps1
@@ -25,9 +25,9 @@ wget https://vstsagentpackage.azureedge.net/agent/2.172.2/vsts-agent-win-x64-2.1
 ## TODO Configure agents
 
 # Provisioning
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version 16.2.73
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version 16.3.45
 [Environment]::SetEnvironmentVariable("CHEF_LICENSE", "accept-silent", "User")
-[Environment]::SetEnvironmentVariable("AZP_AGENT_CHEF_CLIENT", "16.2.73", "User")
+[Environment]::SetEnvironmentVariable("AZP_AGENT_CHEF_CLIENT", "16.3.45", "User")
 
 choco install 7zip.portable -y --version 19.0
 
@@ -48,13 +48,13 @@ choco install -y dotnetcore-sdk
 choco install -y vagrant --version 2.2.9 --ignore-package-exit-codes
 [Environment]::SetEnvironmentVariable("AZP_AGENT_VAGRANT", "2.2.9", "User")
 
-choco install -y packer --version 1.5.5
+choco install -y packer --version 1.6.1
 [Environment]::SetEnvironmentVariable("PACKER_CACHE_DIR", "C:\Users\Admin\.packer\cache", "User")
-[Environment]::SetEnvironmentVariable("AZP_AGENT_PACKER", "1.5.5", "User")
+[Environment]::SetEnvironmentVariable("AZP_AGENT_PACKER", "1.6.1", "User")
 
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef-workstation -version 20.7.96
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef-workstation -version 20.8.111
 [Environment]::SetEnvironmentVariable("CHEF_LICENSE", "accept-silent", "User")
-[Environment]::SetEnvironmentVariable("AZP_AGENT_CHEF_WORKSTATION", "20.7.96", "User")
+[Environment]::SetEnvironmentVariable("AZP_AGENT_CHEF_WORKSTATION", "20.8.111", "User")
 
 # Get-WindowsOptionalFeature -Online | Where { $_.FeatureName -match "hyper" } | Where { $_.State -ne "Enabled" } | ForEach { Enable-WindowsOptionalFeature -Online -FeatureName $_.FeatureName -All -NoRestart }
 # [Environment]::SetEnvironmentVariable("AZP_AGENT_HYPERV", "9.0", "User")
diff --git a/src/u/packer/builders/hyperv-iso/template.json b/src/u/packer/builders/hyperv-iso/template.json
index f9170e098..445a37436 100644
--- a/src/u/packer/builders/hyperv-iso/template.json
+++ b/src/u/packer/builders/hyperv-iso/template.json
@@ -10,7 +10,6 @@
         "{{user `iso_url_local`}}",
         "{{user `iso_url_remote`}}"
       ],
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "headless": "{{user `hyperv_headless`}}",
       "memory": "{{user `hyperv_memory`}}",
diff --git a/src/u/packer/builders/iso/template.json b/src/u/packer/builders/iso/template.json
index 366f34269..31cb79083 100644
--- a/src/u/packer/builders/iso/template.json
+++ b/src/u/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "",
     "iso_url_remote": "",
-    "iso_checksum_type": "",
     "iso_checksum": ""
   }
 }
\ No newline at end of file
diff --git a/src/u/packer/builders/virtualbox-iso/template.json b/src/u/packer/builders/virtualbox-iso/template.json
index 79ad45437..c8a2c90e2 100644
--- a/src/u/packer/builders/virtualbox-iso/template.json
+++ b/src/u/packer/builders/virtualbox-iso/template.json
@@ -12,7 +12,6 @@
         "{{user `iso_url_local`}}",
         "{{user `iso_url_remote`}}"
       ],
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "headless": "{{user `virtualbox_headless`}}",
       "vboxmanage": [
diff --git a/src/u1604/packer/builders/iso/template.json b/src/u1604/packer/builders/iso/template.json
index e4f8cef26..85b77e548 100644
--- a/src/u1604/packer/builders/iso/template.json
+++ b/src/u1604/packer/builders/iso/template.json
@@ -1,8 +1,7 @@
 {
   "variables": {
-    "iso_url_local": "{{user `download_directory`}}/ubuntu-16.04.6-server-amd64.iso",
-    "iso_url_remote": "http://mirrors.us.kernel.org/ubuntu-releases/16.04.6/ubuntu-16.04.6-server-amd64.iso",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "16afb1375372c57471ea5e29803a89a5a6bd1f6aabea2e5e34ac1ab7eb9786ac"
+    "iso_url_local": "{{user `download_directory`}}/ubuntu-16.04.7-server-amd64.iso",
+    "iso_url_remote": "http://mirrors.us.kernel.org/ubuntu-releases/16.04.7/ubuntu-16.04.7-server-amd64.iso",
+    "iso_checksum": "sha256:b23488689e16cad7a269eb2d3a3bf725d3457ee6b0868e00c8762d3816e25848"
   }
 }
\ No newline at end of file
diff --git a/src/u1604/packer/provisioners/shell-prepare/scripts/chef.sh b/src/u1604/packer/provisioners/shell-prepare/scripts/chef.sh
index 8b89aa435..bc8d23a16 100644
--- a/src/u1604/packer/provisioners/shell-prepare/scripts/chef.sh
+++ b/src/u1604/packer/provisioners/shell-prepare/scripts/chef.sh
@@ -2,10 +2,10 @@
 
 case "$PACKER_BUILDER_TYPE" in
 virtualbox-iso|hyperv-iso|azure-arm)
-    apt-get -y install p7zip-full;
-
-    curl -L https://omnitruck.chef.io/install.sh | bash -s -- -P chef -v 16.2.73
+    curl -L https://omnitruck.chef.io/install.sh | bash -s -- -P chef -v 16.3.45
     echo "CHEF_LICENSE=accept-silent" >> /etc/environment
+
+    apt-get -y install p7zip-full;
 esac
 
 reboot
diff --git a/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb b/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb
index bf7a72aa4..5a739c925 100644
--- a/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb
+++ b/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb
@@ -4,7 +4,7 @@
       'version' => '6.1.12',
     },
     'virtio-drivers' => {
-      'version' => '0.1.187.100',
+      'version' => '0.1.189.100',
     },
   },
 }
diff --git a/src/w/packer/builders/hyperv-iso/template.json b/src/w/packer/builders/hyperv-iso/template.json
index 2c7a8a61f..1bb19ebea 100644
--- a/src/w/packer/builders/hyperv-iso/template.json
+++ b/src/w/packer/builders/hyperv-iso/template.json
@@ -11,7 +11,6 @@
         "{{user `iso_url_local`}}",
         "{{user `iso_url_remote`}}"
       ],
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "headless": "{{user `hyperv_headless`}}",
       "memory": "{{user `hyperv_memory`}}",
diff --git a/src/w/packer/builders/iso/floppy/Autounattend.ps1 b/src/w/packer/builders/iso/floppy/Autounattend.ps1
index 40ec5c8b0..d35060e6d 100644
--- a/src/w/packer/builders/iso/floppy/Autounattend.ps1
+++ b/src/w/packer/builders/iso/floppy/Autounattend.ps1
@@ -8,13 +8,13 @@ $env:chocolateyVersion = '0.10.15'
 Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-WebRequest https://chocolatey.org/install.ps1 -UseBasicParsing | Invoke-Expression
 choco config set cacheLocation C:\tmp\chocolatey
 
-Write-Host "Install 7zip"
-choco install 7zip.portable -y
-
 Write-Host "Install Chef Client"
-. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version 16.2.73
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version 16.3.45
 [Environment]::SetEnvironmentVariable("CHEF_LICENSE", "accept-silent", "Machine")
 
+Write-Host "Install 7zip"
+choco install 7zip.portable -y
+
 Write-Host "Install WinRM"
 netsh advfirewall firewall add rule name="WinRM-Install" dir=in localport=5985 protocol=TCP action=block
 Get-NetConnectionProfile | ForEach-Object { Set-NetConnectionProfile -InterfaceIndex $_.InterfaceIndex -NetworkCategory Private }
diff --git a/src/w/packer/builders/iso/template.json b/src/w/packer/builders/iso/template.json
index 366f34269..31cb79083 100644
--- a/src/w/packer/builders/iso/template.json
+++ b/src/w/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "",
     "iso_url_remote": "",
-    "iso_checksum_type": "",
     "iso_checksum": ""
   }
 }
\ No newline at end of file
diff --git a/src/w/packer/builders/virtualbox-iso/template.json b/src/w/packer/builders/virtualbox-iso/template.json
index ccd19a5fc..c424dd688 100644
--- a/src/w/packer/builders/virtualbox-iso/template.json
+++ b/src/w/packer/builders/virtualbox-iso/template.json
@@ -13,7 +13,6 @@
         "{{user `iso_url_local`}}",
         "{{user `iso_url_remote`}}"
       ],
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
       "iso_checksum": "{{user `iso_checksum`}}",
       "headless": "{{user `virtualbox_headless`}}",
       "vboxmanage": [
diff --git a/src/w101809eltsc/packer/builders/iso/template.json b/src/w101809eltsc/packer/builders/iso/template.json
index 2115dc17f..dae800ddf 100644
--- a/src/w101809eltsc/packer/builders/iso/template.json
+++ b/src/w101809eltsc/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso",
     "iso_url_remote": "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a"
+    "iso_checksum": "sha256:668fe1af70c2f7416328aee3a0bb066b12dc6bbd2576f40f812b95741e18bc3a"
   }
 }
\ No newline at end of file
diff --git a/src/w101909e/packer/builders/iso/template.json b/src/w101909e/packer/builders/iso/template.json
index e63f79534..b36c0c9f1 100644
--- a/src/w101909e/packer/builders/iso/template.json
+++ b/src/w101909e/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
     "iso_url_remote": "https://software-download.microsoft.com/download/pr/18363.418.191007-0143.19h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "9ef81b6a101afd57b2dbfa44d5c8f7bc94ff45b51b82c5a1f9267ce2e63e9f53"
+    "iso_checksum": "sha256:9ef81b6a101afd57b2dbfa44d5c8f7bc94ff45b51b82c5a1f9267ce2e63e9f53"
   }
 }
\ No newline at end of file
diff --git a/src/w102004e/packer/builders/iso/template.json b/src/w102004e/packer/builders/iso/template.json
index 9c8f4f803..e57780325 100644
--- a/src/w102004e/packer/builders/iso/template.json
+++ b/src/w102004e/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
     "iso_url_remote": "https://software-download.microsoft.com/download/pr/19041.264.200511-0456.vb_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "f1a4f2176259167cd2c8bf83f3f5a4039753b6cc28c35ac624da95a36e9620fc"
+    "iso_checksum": "sha256:f1a4f2176259167cd2c8bf83f3f5a4039753b6cc28c35ac624da95a36e9620fc"
   }
 }
\ No newline at end of file
diff --git a/src/w10ipe/packer/builders/iso/template.json b/src/w10ipe/packer/builders/iso/template.json
index 7befbab58..640ce46f4 100644
--- a/src/w10ipe/packer/builders/iso/template.json
+++ b/src/w10ipe/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/Windows10_InsiderPreview_EnterpriseVL_x64_en-us_20150.iso",
     "iso_url_remote": "",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "63703257683ced6c9c5fe3da3937a9d8e0e1dfd6518a729ab193597d8b4d30a0"
+    "iso_checksum": "sha256:63703257683ced6c9c5fe3da3937a9d8e0e1dfd6518a729ab193597d8b4d30a0"
   }
 }
\ No newline at end of file
diff --git a/src/ws2016s/packer/builders/iso/template.json b/src/ws2016s/packer/builders/iso/template.json
index 8878730f9..1565223bf 100644
--- a/src/ws2016s/packer/builders/iso/template.json
+++ b/src/ws2016s/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
     "iso_url_remote": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f"
+    "iso_checksum": "sha256:1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f"
   }
 }
\ No newline at end of file
diff --git a/src/ws2019s/packer/builders/iso/template.json b/src/ws2019s/packer/builders/iso/template.json
index 19f1d4b11..30a4fef1e 100644
--- a/src/ws2019s/packer/builders/iso/template.json
+++ b/src/ws2019s/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso",
     "iso_url_remote": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "549bca46c055157291be6c22a3aaaed8330e78ef4382c99ee82c896426a1cee1"
+    "iso_checksum": "sha256:549bca46c055157291be6c22a3aaaed8330e78ef4382c99ee82c896426a1cee1"
   }
 }
\ No newline at end of file
diff --git a/src/wsipsc/packer/builders/iso/template.json b/src/wsipsc/packer/builders/iso/template.json
index 819100798..984ee47b5 100644
--- a/src/wsipsc/packer/builders/iso/template.json
+++ b/src/wsipsc/packer/builders/iso/template.json
@@ -2,7 +2,6 @@
   "variables": {
     "iso_url_local": "{{user `download_directory`}}/Windows_InsiderPreview_Server_en-us_20185.iso",
     "iso_url_remote": "",
-    "iso_checksum_type": "sha256",
-    "iso_checksum": "7e7859b48bfb5f945703abf120bfaca611ce7f7689e45cdf37d0598661a21d37"
+    "iso_checksum": "sha256:7e7859b48bfb5f945703abf120bfaca611ce7f7689e45cdf37d0598661a21d37"
   }
 }
\ No newline at end of file