diff --git a/.github/workflows/robox.yml b/.github/workflows/robox.yml
index 0bcf0c25a..3c5e9e7d9 100644
--- a/.github/workflows/robox.yml
+++ b/.github/workflows/robox.yml
@@ -127,7 +127,7 @@ jobs:
         export PACKER_LOG_PATH=packer-cache-m64.txt ; packer validate packer-cache-m64.json &>> packer-validate.txt && printf "File  + packer-cache-m64.json\n" || { printf "File  - packer-cache-m64.json\n\n\n" ; unset PACKER_LOG ; unset PACKER_LOG_PATH ; packer validate packer-cache-m64.json ; exit 1 ; }
         date +"%nFinished Cache box validation at %r on %x%n"
     - name: Archive Log Files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: validate-logs
diff --git a/developer-ova-x64.json b/developer-ova-x64.json
index 679a64596..96dafcf4e 100644
--- a/developer-ova-x64.json
+++ b/developer-ova-x64.json
@@ -72,9 +72,9 @@
             "disk_type_id": "0",
             "cpus": 4,
             "memory": 4096,
-            "version": "12",
+            "version": "13",
             "vmx_data_post": {
-              "virtualHW.version": "12",
+              "virtualHW.version": "13",
               "cleanShutdown": "TRUE",
               "softPowerOff": "FALSE",
               "ethernet0.virtualDev": "e1000",
diff --git a/developer-vmware-x64.json b/developer-vmware-x64.json
index 7320e006a..aa584c070 100644
--- a/developer-vmware-x64.json
+++ b/developer-vmware-x64.json
@@ -75,9 +75,9 @@
             "disk_type_id": "0",
             "cpus": 4,
             "memory": 4096,
-            "version": "12",
+            "version": "13",
             "vmx_data_post": {
-              "virtualHW.version": "12",
+              "virtualHW.version": "13",
               "cleanShutdown": "TRUE",
               "softPowerOff": "FALSE",
               "ethernet0.virtualDev": "e1000",
diff --git a/generic-vmware-x32.json b/generic-vmware-x32.json
index 0c59c85d0..16e9ad223 100644
--- a/generic-vmware-x32.json
+++ b/generic-vmware-x32.json
@@ -223,9 +223,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -276,9 +276,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -329,9 +329,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -382,9 +382,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -435,9 +435,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
diff --git a/generic-vmware-x64.json b/generic-vmware-x64.json
index 588cfff28..1ae18d461 100644
--- a/generic-vmware-x64.json
+++ b/generic-vmware-x64.json
@@ -3342,9 +3342,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3386,9 +3386,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3436,7 +3436,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -3445,7 +3445,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3493,7 +3493,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -3502,7 +3502,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3550,7 +3550,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -3559,7 +3559,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3607,7 +3607,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -3616,7 +3616,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3655,9 +3655,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3696,9 +3696,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3737,9 +3737,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3798,9 +3798,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3843,9 +3843,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3888,9 +3888,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3933,9 +3933,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3978,9 +3978,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4023,9 +4023,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4076,9 +4076,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4129,9 +4129,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4186,9 +4186,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4235,9 +4235,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4284,9 +4284,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4333,9 +4333,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4394,9 +4394,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4455,9 +4455,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4500,12 +4500,12 @@
       "disk_type_id": "0",
       "cpus": 8,
       "memory": 8192,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "vmci0.present": "TRUE"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4560,9 +4560,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4583,8 +4583,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -4605,9 +4604,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4628,8 +4627,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -h -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -h -p now"
     },
     {
       "type": "vmware-iso",
@@ -4662,9 +4660,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4685,8 +4683,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -4703,9 +4700,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4745,9 +4742,9 @@
       "disk_adapter_type": "sata",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4800,9 +4797,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4823,8 +4820,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -4868,9 +4864,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4891,8 +4887,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -4953,9 +4948,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -4976,8 +4971,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "/sbin/poweroff",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "/sbin/poweroff"
     },
     {
       "type": "vmware-iso",
@@ -5008,9 +5002,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5031,8 +5025,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -5059,7 +5052,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -5068,7 +5061,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5119,9 +5112,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5180,9 +5173,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5225,9 +5218,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5267,9 +5260,9 @@
       "disk_adapter_type": "sata",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5320,7 +5313,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -5329,7 +5322,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5371,9 +5364,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5412,9 +5405,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5457,9 +5450,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5518,9 +5511,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5571,7 +5564,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -5580,7 +5573,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5639,9 +5632,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5683,9 +5676,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5765,9 +5758,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5788,8 +5781,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "/sbin/poweroff",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "/sbin/poweroff"
     },
     {
       "type": "vmware-iso",
@@ -5818,7 +5810,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -5827,7 +5819,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5878,9 +5870,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5931,9 +5923,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -5984,9 +5976,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6040,9 +6032,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6084,9 +6076,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6137,7 +6129,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -6146,7 +6138,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6197,7 +6189,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -6206,7 +6198,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6260,9 +6252,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6301,9 +6293,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6342,9 +6334,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6386,9 +6378,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6443,9 +6435,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6466,8 +6458,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -6498,9 +6489,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6521,8 +6512,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -6566,9 +6556,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6589,8 +6579,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -6619,9 +6608,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6665,9 +6654,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6688,8 +6677,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -h -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -h -p now"
     },
     {
       "type": "vmware-iso",
@@ -6721,9 +6709,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6774,7 +6762,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -6783,7 +6771,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6825,9 +6813,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6878,9 +6866,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6934,9 +6922,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -6978,9 +6966,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7020,9 +7008,9 @@
       "disk_adapter_type": "sata",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7061,9 +7049,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7102,9 +7090,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7155,7 +7143,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -7164,7 +7152,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7203,9 +7191,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7245,9 +7233,9 @@
       "disk_adapter_type": "sata",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7286,9 +7274,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7327,9 +7315,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7383,9 +7371,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7441,9 +7429,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7499,9 +7487,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7552,7 +7540,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -7561,7 +7549,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7615,9 +7603,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7668,9 +7656,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7721,7 +7709,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -7730,7 +7718,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7781,9 +7769,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7836,9 +7824,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7859,8 +7847,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -7904,9 +7891,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -7927,8 +7914,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -7961,9 +7947,9 @@
       "disk_adapter_type": "sata",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -8018,9 +8004,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -8041,8 +8027,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -8076,9 +8061,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -8129,7 +8114,7 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "softpoweroff": "FALSE",
         "powertype.poweroff": "hard",
@@ -8138,7 +8123,7 @@
         "powertype.suspend": "hard"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -8194,9 +8179,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -8327,4 +8312,4 @@
       }
     ]
   ]
-}
\ No newline at end of file
+}
diff --git a/lineage-vmware-x64.json b/lineage-vmware-x64.json
index 9c51572bc..bef76dff6 100644
--- a/lineage-vmware-x64.json
+++ b/lineage-vmware-x64.json
@@ -99,9 +99,9 @@
       "disk_type_id": "0",
       "cpus": 4,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -168,4 +168,4 @@
       }
     ]
   ]
-}
\ No newline at end of file
+}
diff --git a/magma-vmware-x64.json b/magma-vmware-x64.json
index d288eba10..0b60ce966 100644
--- a/magma-vmware-x64.json
+++ b/magma-vmware-x64.json
@@ -1388,9 +1388,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1429,9 +1429,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1470,9 +1470,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1531,9 +1531,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1576,9 +1576,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1629,9 +1629,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1686,9 +1686,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1735,9 +1735,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1784,9 +1784,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1829,12 +1829,12 @@
       "disk_type_id": "0",
       "cpus": 8,
       "memory": 8192,
-      "version": "12",
+      "version": "13",
       "vmx_data": {
         "vmci0.present": "TRUE"
       },
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1889,9 +1889,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1912,8 +1912,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -p now"
     },
     {
       "type": "vmware-iso",
@@ -1934,9 +1933,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -1957,8 +1956,7 @@
       "ssh_port": 22,
       "ssh_handshake_attempts": 1000,
       "ssh_timeout": "3600s",
-      "shutdown_command": "shutdown -h -p now",
-      "tools_upload_flavor": "freebsd"
+      "shutdown_command": "shutdown -h -p now"
     },
     {
       "type": "vmware-iso",
@@ -1987,9 +1985,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2040,9 +2038,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2093,9 +2091,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2138,9 +2136,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2183,9 +2181,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2228,9 +2226,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2273,9 +2271,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2322,9 +2320,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2371,9 +2369,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2420,9 +2418,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2469,9 +2467,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2518,9 +2516,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2567,9 +2565,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2608,9 +2606,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2653,9 +2651,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2698,9 +2696,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2743,9 +2741,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2788,9 +2786,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -2833,9 +2831,9 @@
       "disk_type_id": "0",
       "cpus": 2,
       "memory": 2048,
-      "version": "12",
+      "version": "13",
       "vmx_data_post": {
-        "virtualHW.version": "12",
+        "virtualHW.version": "13",
         "cleanShutdown": "TRUE",
         "softPowerOff": "FALSE",
         "ethernet0.virtualDev": "e1000",
@@ -3076,4 +3074,4 @@
       }
     ]
   ]
-}
\ No newline at end of file
+}