diff --git a/README.md b/README.md
index c373f10..80e0d86 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,15 @@
# Packer.Images
-Opinionated set of packer templates for producing .OVA appliances, which can then be deployed (semi)unattended through the use of vApp properties:
+Opinionated set of packer templates for producing .OVA appliances, which can then be deployed (semi)unattended through the use of vApp properties:
-## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/Server2019) **Server2019**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/Server2019) - LTSC xx09
- This image in itself does not actually provide much benefit over other customization methods that are available during an unattended deployment; it serves primarily as a basis for the following images.
-
-## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADDS) **ADDS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADDS) - Active Directory Domain Services
- Lorem ipsum.
+## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/UbuntuServer20.04) **Ubuntu Server 20.04**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/UbuntuServer20.04) - LTS
+ Lorem ipsum.
-## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADCS) **ADCS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADCS) - Active Directory Certificate Services
- Lorem ipsum.
+## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/Server2019) **Windows Server 2019**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/Server2019) - LTSC xx09
+ This image in itself does not actually provide much benefit over other customization methods that are available during an unattended deployment; it serves primarily as a basis for the following images.
+
+## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADDS) **ADDS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADDS) - Active Directory Domain Services
+ Lorem ipsum.
+
+## [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADCS) **ADCS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADCS) - Active Directory Certificate Services
+ Lorem ipsum.
diff --git a/packer/variables.vsphere.json b/packer/variables.vsphere.json
deleted file mode 100644
index cd6c507..0000000
--- a/packer/variables.vsphere.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "vcenter_server": "bv11-vc01.bessems.lan",
- "vsphere_username": "administrator@vsphere.local",
- "vsphere_datacenter": "DeSchakel",
- "vsphere_host": "bv11-esx.bessems.eu",
- "vsphere_hostip": "192.168.11.200",
- "vsphere_datastore": "Datastore02.SSD",
- "vsphere_folder": "/Packer",
- "vsphere_templatefolder": "/Templates",
- "vsphere_network": "LAN"
-}
\ No newline at end of file
diff --git a/packer/vsphere.auto.pkrvars.hcl b/packer/vsphere.auto.pkrvars.hcl
new file mode 100644
index 0000000..529c53a
--- /dev/null
+++ b/packer/vsphere.auto.pkrvars.hcl
@@ -0,0 +1,9 @@
+vcenter_server = "bv11-vc.bessems.lan"
+vsphere_username = "administrator@vsphere.local"
+vsphere_datacenter = "DeSchakel"
+vsphere_host = "bv11-esx.bessems.lan"
+vsphere_hostip = "192.168.11.200"
+vsphere_datastore = "Datastore01.SSD"
+vsphere_folder = "/Packer"
+vsphere_templatefolder = "/Templates"
+vsphere_network = "LAN"
diff --git a/scripts/Disable-WinRM.ps1 b/scripts/Disable-WinRM.ps1
deleted file mode 100644
index 1ce9273..0000000
--- a/scripts/Disable-WinRM.ps1
+++ /dev/null
@@ -1,8 +0,0 @@
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=block
-netsh advfirewall firewall set rule group="Windows Remote Management" new enable=yes
-$winrmService = Get-Service -Name WinRM
-if ($winrmService.Status -eq "Running"){
- Disable-PSRemoting -Force
-}
-Stop-Service winrm
-Set-Service -Name winrm -StartupType Disabled
diff --git a/scripts/Enable-WinRM.ps1 b/scripts/Enable-WinRM.ps1
deleted file mode 100644
index 3d70efe..0000000
--- a/scripts/Enable-WinRM.ps1
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetworkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"))
-$Connections = $NetworkListManager.GetNetworkConnections()
-$Connections | ForEach-Object { $_.GetNetwork().SetCategory(1) }
-
-Enable-PSRemoting -Force
-winrm quickconfig -q
-winrm quickconfig -transport:http
-winrm set winrm/config '@{MaxTimeoutms="1800000"}'
-winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="800"}'
-winrm set winrm/config/service '@{AllowUnencrypted="true"}'
-winrm set winrm/config/service/auth '@{Basic="true"}'
-winrm set winrm/config/client/auth '@{Basic="true"}'
-winrm set winrm/config/listener?Address=*+Transport=HTTP '@{Port="5985"}'
-netsh advfirewall firewall set rule group="Windows Remote Administration" new enable=yes
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=allow
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public new remoteip=any
-Set-Service winrm -startuptype "auto"
-Restart-Service winrm
diff --git a/scripts/Install-VMwareTools.cmd b/scripts/Install-VMwareTools.cmd
deleted file mode 100644
index 58f2b36..0000000
--- a/scripts/Install-VMwareTools.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@rem Silent mode, basic UI, no reboot
-e:\setup64 /s /v "/qb REBOOT=R"
\ No newline at end of file
diff --git a/scripts/MVMC/BlockList.xml b/scripts/MVMC/BlockList.xml
deleted file mode 100644
index d590aeb..0000000
--- a/scripts/MVMC/BlockList.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
- MVMCP2VAgent
- VMTools
- VMUpgradeHelper
- vmvss
- vmdesched
- Virtual Server
-
- vmh
-
- xensvc
-
-
-
- vmx_svga
- vmmouse
- vmscsi
- amdpcn
- PCnet
- VMMEMCTL
-
- pvscsi
- vmci
- vmmouse
- vmaudio
- vmrawdsk
- vmxnet
- vmxnet3ndis6
- vm3dmp
- vmdebug
- vmxnet3ndis5
-
-
- cirrus
-
- buslogic
- symc810
- cpqarray
- pcntn4m
- cpqnf3
- MRaidNT
- Symc8XX
-
- viaide
- VIAudio
- VIAPFD
- viafilter
- viaagp
- viaagp1
-
- E100B
-
- 4mmdat
- 4mmdat-SeSFT
- SCSIChanger
-
-
- vmm
-
- xenevtchn
- xenvbd
- xennet
-
-
- ProMON
- s3tray2
- VMwareTray
- VMwareUser
-
-
\ No newline at end of file
diff --git a/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll b/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll
deleted file mode 100644
index 15ffdcb..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Framework.dll b/scripts/MVMC/Microsoft.Accelerators.Framework.dll
deleted file mode 100644
index 714ec9b..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Framework.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll
deleted file mode 100644
index ae32db5..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll
deleted file mode 100644
index 4dab6e8..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll
deleted file mode 100644
index eab48e2..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll
deleted file mode 100644
index 9adbdf0..0000000
Binary files a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll b/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll
deleted file mode 100644
index 330e60e..0000000
Binary files a/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Practices.Unity.dll b/scripts/MVMC/Microsoft.Practices.Unity.dll
deleted file mode 100644
index b3ca3ce..0000000
Binary files a/scripts/MVMC/Microsoft.Practices.Unity.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll b/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll
deleted file mode 100644
index a07b399..0000000
Binary files a/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll
deleted file mode 100644
index dcc2e64..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll
deleted file mode 100644
index d7762a3..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll
deleted file mode 100644
index d3e036d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll
deleted file mode 100644
index 3353bc9..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll
deleted file mode 100644
index 7aae384..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll
deleted file mode 100644
index 69839bf..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll
deleted file mode 100644
index 3e5cd36..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll
deleted file mode 100644
index 4e138ae..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll
deleted file mode 100644
index bf1863d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Management.dll b/scripts/MVMC/Microsoft.WindowsAzure.Management.dll
deleted file mode 100644
index febdfcf..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Management.dll and /dev/null differ
diff --git a/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll b/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll
deleted file mode 100644
index 0d29d8d..0000000
Binary files a/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll and /dev/null differ
diff --git a/scripts/MVMC/MvmcCmdlet.dll b/scripts/MVMC/MvmcCmdlet.dll
deleted file mode 100644
index 5cef267..0000000
Binary files a/scripts/MVMC/MvmcCmdlet.dll and /dev/null differ
diff --git a/scripts/MVMC/MvmcCmdlet.psd1 b/scripts/MVMC/MvmcCmdlet.psd1
deleted file mode 100644
index a2be3f7..0000000
Binary files a/scripts/MVMC/MvmcCmdlet.psd1 and /dev/null differ
diff --git a/scripts/MVMC/Sshlib_x64.dll b/scripts/MVMC/Sshlib_x64.dll
deleted file mode 100644
index ce68651..0000000
Binary files a/scripts/MVMC/Sshlib_x64.dll and /dev/null differ
diff --git a/scripts/MVMC/Sshlib_x86.dll b/scripts/MVMC/Sshlib_x86.dll
deleted file mode 100644
index 4658589..0000000
Binary files a/scripts/MVMC/Sshlib_x86.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Core.dll b/scripts/MVMC/System.Reactive.Core.dll
deleted file mode 100644
index b893f83..0000000
Binary files a/scripts/MVMC/System.Reactive.Core.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Interfaces.dll b/scripts/MVMC/System.Reactive.Interfaces.dll
deleted file mode 100644
index 3dbb203..0000000
Binary files a/scripts/MVMC/System.Reactive.Interfaces.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Linq.dll b/scripts/MVMC/System.Reactive.Linq.dll
deleted file mode 100644
index 35d022a..0000000
Binary files a/scripts/MVMC/System.Reactive.Linq.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.PlatformServices.dll b/scripts/MVMC/System.Reactive.PlatformServices.dll
deleted file mode 100644
index 77f2db4..0000000
Binary files a/scripts/MVMC/System.Reactive.PlatformServices.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Providers.dll b/scripts/MVMC/System.Reactive.Providers.dll
deleted file mode 100644
index fabc533..0000000
Binary files a/scripts/MVMC/System.Reactive.Providers.dll and /dev/null differ
diff --git a/scripts/MVMC/System.Reactive.Windows.Threading.dll b/scripts/MVMC/System.Reactive.Windows.Threading.dll
deleted file mode 100644
index 1c7840f..0000000
Binary files a/scripts/MVMC/System.Reactive.Windows.Threading.dll and /dev/null differ
diff --git a/scripts/New-WindowsImageJob.ps1 b/scripts/New-WindowsImageJob.ps1
deleted file mode 100644
index 634d41e..0000000
--- a/scripts/New-WindowsImageJob.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-#Requires -Modules 'dism'
-Param(
- [Parameter(Mandatory)]
- [string]$ImageName,
- [Parameter(Mandatory)]
- [string]$SourceFolder,
- [Parameter(Mandatory)]
- [string]$DestinationFile
-)
-
-$StartJobSplat = @{
- ArgumentList = $ImageName, $SourceFolder, $DestinationFile
- ScriptBlock = {
- Param(
- $ImageName,
- $SourceFolder,
- $DestinationFile
- )
-
- $NewWindowsImageSplat = @{
- Name = $ImageName
- CapturePath = $SourceFolder
- ImagePath = $DestinationFile
- Verify = $True
- }
- New-WindowsImage @NewWindowsImageSplat
- }
-}
-$Job = Start-Job @StartJobSplat
-
-While ($Job.State -eq 'Running') {
- $GetItemSplat = @{
- Path = $DestinationFile
- ErrorAction = 'SilentlyContinue'
- }
- $OutputFile = Get-Item @GetItemSplat
- If ($OutputFile) {
- Write-Host "Export in progress ... $($OutputFile.FullName); Size: $('{0:n2}' -f ($OutputFile.Length / 1MB))MB"
- }
- Else {
- Write-Host "Export initiating ... "
- }
-
- $StartSleepSplat = @{
- Seconds = 30
- }
- Start-Sleep @StartSleepSplat
-}
-
-Receive-Job $Job
-Remove-Job $Job
\ No newline at end of file
diff --git a/scripts/Set-NetworkProfile.ps1 b/scripts/Set-NetworkProfile.ps1
deleted file mode 100644
index 7433079..0000000
--- a/scripts/Set-NetworkProfile.ps1
+++ /dev/null
@@ -1,23 +0,0 @@
-# You cannot enable Windows PowerShell Remoting on network connections that are set to Public
-# Spin through all the network locations and if they are set to Public, set them to Private
-# using the INetwork interface:
-# http://msdn.microsoft.com/en-us/library/windows/desktop/aa370750(v=vs.85).aspx
-# For more info, see:
-# http://blogs.msdn.com/b/powershell/archive/2009/04/03/setting-network-location-to-private.aspx
-
-# Network location feature was only introduced in Windows Vista - no need to bother with this
-# if the operating system is older than Vista
-if([environment]::OSVersion.version.Major -lt 6) { return }
-
-# You cannot change the network location if you are joined to a domain, so abort
-if(1,3,4,5 -contains (Get-WmiObject win32_computersystem).DomainRole) { return }
-
-# Get network connections
-$networkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"))
-$connections = $networkListManager.GetNetworkConnections()
-
-$connections |foreach {
- Write-Host $_.GetNetwork().GetName()"category was previously set to"$_.GetNetwork().GetCategory()
- $_.GetNetwork().SetCategory(1)
- Write-Host $_.GetNetwork().GetName()"changed to category"$_.GetNetwork().GetCategory()
-}
diff --git a/scripts/Uninstall-VMwareTools.Sysprep.cmd b/scripts/Uninstall-VMwareTools.Sysprep.cmd
deleted file mode 100644
index f75b7a5..0000000
--- a/scripts/Uninstall-VMwareTools.Sysprep.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-@rem Uninstall VMware Tools
-@rem (wait for orphaned child process to finish)
-@rem Silent mode, basic UI, no reboot
-start "Uninstall VMware Tools" /b /w e:\setup64 /s /v "/qb REBOOT=R REMOVE=ALL"
-
-@rem Initiate Sysprep
-C:\Windows\System32\Sysprep\sysprep.exe /generalize /oobe /unattend:A:\Sysprep_Unattend.xml /quiet /shutdown
\ No newline at end of file