diff --git a/freebsd/freebsd-11.1-amd64.json b/freebsd/freebsd-11.1-amd64.json
deleted file mode 100644
index c365e0907..000000000
--- a/freebsd/freebsd-11.1-amd64.json
+++ /dev/null
@@ -1,229 +0,0 @@
-{
-  "builders": [
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_additions_mode": "disable",
-      "guest_os_type": "FreeBSD_64",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-virtualbox",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "{{ user `memory` }}"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "{{ user `cpus` }}"
-        ]
-      ],
-      "virtualbox_version_file": ".vbox_version",
-      "vm_name": "{{ user `template` }}"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "<wait5>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_os_type": "freebsd-64",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-vmware",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "vmware-iso",
-      "vm_name": "{{ user `template` }}",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "{{ user `memory` }}",
-        "numvcpus": "{{ user `cpus` }}"
-      },
-      "vmx_remove_ethernet_interfaces": true
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "8s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_os_type": "freebsd",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-parallels",
-      "parallels_tools_mode": "disable",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "{{ user `memory` }}"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "{{ user `cpus` }}"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-set",
-          "cdrom0",
-          "--iface",
-          "ide"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-del",
-          "fdd0"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-del",
-          "parallel0"
-        ]
-      ],
-      "prlctl_version_file": ".prlctl_version",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "{{ user `template` }}"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "7s",
-      "disk_size": "{{user `disk_size`}}",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-qemu",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "qemu",
-      "vm_name": "{{ user `template` }}"
-    }
-  ],
-  "post-processors": [
-    {
-      "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "vagrantfile_templates/freebsd.rb"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "HOME_DIR=/home/vagrant",
-        "http_proxy={{user `http_proxy`}}",
-        "https_proxy={{user `https_proxy`}}",
-        "no_proxy={{user `no_proxy`}}",
-        "pkg_branch={{user `pkg_branch`}}"
-      ],
-      "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'",
-      "expect_disconnect": true,
-      "scripts": [
-        "scripts/update.sh",
-        "scripts/postinstall.sh",
-        "scripts/sudoers.sh",
-        "../_common/vagrant.sh",
-        "scripts/vmtools.sh",
-        "scripts/cleanup.sh",
-        "scripts/minimize.sh"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "box_basename": "freebsd-11.1",
-    "build_timestamp": "{{isotime \"20060102150405\"}}",
-    "cpus": "1",
-    "disk_size": "65536",
-    "git_revision": "__unknown_git_revision__",
-    "headless": "",
-    "http_proxy": "{{env `http_proxy`}}",
-    "https_proxy": "{{env `https_proxy`}}",
-    "install_path": "freebsd-11/installerconfig",
-    "iso_checksum": "ff4c749ea0aaaceedb2432ba3e0fd0c1b64f5a72141b1ec06b9ced52b5de0dbf",
-    "iso_checksum_type": "sha256",
-    "iso_name": "FreeBSD-11.1-RELEASE-amd64-disc1.iso",
-    "memory": "1024",
-    "mirror": "https://download.freebsd.org/ftp",
-    "mirror_directory": "releases/amd64/amd64/ISO-IMAGES/11.1",
-    "no_proxy": "{{env `no_proxy`}}",
-    "pkg_branch": "quarterly",
-    "template": "freebsd-11.1-amd64",
-    "version": "TIMESTAMP"
-  }
-}
-
diff --git a/freebsd/freebsd-11.1-i386.json b/freebsd/freebsd-11.1-i386.json
deleted file mode 100644
index 0b78967e5..000000000
--- a/freebsd/freebsd-11.1-i386.json
+++ /dev/null
@@ -1,229 +0,0 @@
-{
-  "builders": [
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_additions_mode": "disable",
-      "guest_os_type": "FreeBSD",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-virtualbox",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "{{ user `memory` }}"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "{{ user `cpus` }}"
-        ]
-      ],
-      "virtualbox_version_file": ".vbox_version",
-      "vm_name": "{{ user `template` }}"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "<wait5>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_os_type": "freebsd",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-vmware",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "vmware-iso",
-      "vm_name": "{{ user `template` }}",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "{{ user `memory` }}",
-        "numvcpus": "{{ user `cpus` }}"
-      },
-      "vmx_remove_ethernet_interfaces": true
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "8s",
-      "disk_size": "{{user `disk_size`}}",
-      "guest_os_type": "freebsd",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-parallels",
-      "parallels_tools_mode": "disable",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "{{ user `memory` }}"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "{{ user `cpus` }}"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-set",
-          "cdrom0",
-          "--iface",
-          "ide"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-del",
-          "fdd0"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--device-del",
-          "parallel0"
-        ]
-      ],
-      "prlctl_version_file": ".prlctl_version",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "{{ user `template` }}"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "boot -s<wait>",
-        "<enter><wait>",
-        "<wait10><wait10>",
-        "/bin/sh<enter><wait>",
-        "mdmfs -s 100m md1 /tmp<enter><wait>",
-        "mdmfs -s 100m md2 /mnt<enter><wait>",
-        "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait>",
-        "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `install_path`}} && bsdinstall script /tmp/installerconfig<enter><wait>"
-      ],
-      "boot_wait": "7s",
-      "disk_size": "{{user `disk_size`}}",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "../builds/packer-{{user `template`}}-qemu",
-      "shutdown_command": "echo 'vagrant' | su -m root -c 'shutdown -p now'",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "qemu",
-      "vm_name": "{{ user `template` }}"
-    }
-  ],
-  "post-processors": [
-    {
-      "output": "../builds/{{user `box_basename`}}.{{.Provider}}.box",
-      "type": "vagrant",
-      "vagrantfile_template": "vagrantfile_templates/freebsd.rb"
-    }
-  ],
-  "provisioners": [
-    {
-      "environment_vars": [
-        "HOME_DIR=/home/vagrant",
-        "http_proxy={{user `http_proxy`}}",
-        "https_proxy={{user `https_proxy`}}",
-        "no_proxy={{user `no_proxy`}}",
-        "pkg_branch={{user `pkg_branch`}}"
-      ],
-      "execute_command": "echo 'vagrant' | {{.Vars}} su -m root -c 'sh -eux {{.Path}}'",
-      "expect_disconnect": true,
-      "scripts": [
-        "scripts/update.sh",
-        "scripts/postinstall.sh",
-        "scripts/sudoers.sh",
-        "../_common/vagrant.sh",
-        "scripts/vmtools.sh",
-        "scripts/cleanup.sh",
-        "scripts/minimize.sh"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "box_basename": "freebsd-11.1-i386",
-    "build_timestamp": "{{isotime \"20060102150405\"}}",
-    "cpus": "1",
-    "disk_size": "40960",
-    "git_revision": "__unknown_git_revision__",
-    "headless": "",
-    "http_proxy": "{{env `http_proxy`}}",
-    "https_proxy": "{{env `https_proxy`}}",
-    "install_path": "freebsd-11/installerconfig",
-    "iso_checksum": "e53ae5fc58fd2e28643ba4c64e2c49505cf9d84d22396e3633ee9670782aab57",
-    "iso_checksum_type": "sha256",
-    "iso_name": "FreeBSD-11.1-RELEASE-i386-disc1.iso",
-    "memory": "1024",
-    "mirror": "https://download.freebsd.org/ftp",
-    "mirror_directory": "releases/i386/i386/ISO-IMAGES/11.1",
-    "no_proxy": "{{env `no_proxy`}}",
-    "pkg_branch": "quarterly",
-    "template": "freebsd-11.1-i386",
-    "version": "TIMESTAMP"
-  }
-}
-