diff --git a/README.md b/README.md
index 894807e5..7970b5de 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@ FacterDB::get_facts('osfamily=Debian')
 | Ubuntu 15.10                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |     |  2  |  2  |  2  |     |     |     |     |
 | Ubuntu 16.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |     |
 | Ubuntu 16.10                |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  2  |     |     |     |
+| Ubuntu 18.04                | 1   |  1  | 1   |  1  | 1   | 1   |  1  |  1  |     |     |     |     |     |     |  0  |     |     |     |
 | Windows 10                  |     |     |     |     |     |     |     |  2  |     |     |     |     |  2  |  2  |  2  |  2  |  2  |     |
 | Windows 10.0.14393          |     |     |     |  2  |  2  |  2  |  2  |     |  2  |  2  |     |  2  |     |     |     |     |     |     |
 | Windows 7                   |     |     |     |  1  |  1  |  1  |  2  |  1  |  2  |  2  |     |  1  |  1  |  1  |  1  |  1  |  1  |     |
diff --git a/facts/1.6/ubuntu-18.04-x86_64.facts b/facts/1.6/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..a2345f55
--- /dev/null
+++ b/facts/1.6/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,59 @@
+{
+  "gem_version": "~> 1.6.0",
+  "architecture": "amd64",
+  "kernel": "Linux",
+  "domain": "example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "facterversion": "1.6.18",
+  "fqdn": "foo.example.com",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "hostname": "foo",
+  "id": "root",
+  "interfaces": "enp0s3,lo",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "ipaddress": "10.0.2.15",
+  "kernelmajversion": "4.15",
+  "kernelrelease": "4.15.0-20-generic",
+  "kernelversion": "4.15.0",
+  "lsbdistcodename": "bionic",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "lsbdistid": "Ubuntu",
+  "lsbdistrelease": "18.04",
+  "lsbmajdistrelease": "18",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "type": "Other",
+  "memorysize": "985.29 MB",
+  "memoryfree": "825.46 MB",
+  "swapsize": "0.00 kB",
+  "swapfree": "0.00 kB",
+  "memorytotal": "985.29 MB",
+  "operatingsystem": "Ubuntu",
+  "operatingsystemrelease": "18.04",
+  "osfamily": "Debian",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "physicalprocessorcount": 1,
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": "2",
+  "ps": "ps -ef",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "rubyversion": "2.5.1",
+  "selinux": "false",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "timezone": "UTC",
+  "uniqueid": "007f0101",
+  "uptime": "0:09 hours",
+  "uptime_days": 0,
+  "uptime_hours": 0,
+  "uptime_seconds": 542,
+  "virtual": "virtualbox",
+  "is_virtual": "true"
+}
diff --git a/facts/1.7/ubuntu-18.04-x86_64.facts b/facts/1.7/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..5fbf8640
--- /dev/null
+++ b/facts/1.7/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,85 @@
+{
+  "gem_version": "~> 1.7.0",
+  "architecture": "amd64",
+  "kernel": "Linux",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "domain": "example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "osfamily": "Debian",
+  "operatingsystem": "Ubuntu",
+  "lsbdistid": "Ubuntu",
+  "facterversion": "1.7.6",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "fqdn": "foo.example.com",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "hostname": "foo",
+  "id": "root",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "ipaddress": "10.0.2.15",
+  "kernelmajversion": "4.15",
+  "kernelrelease": "4.15.0-20-generic",
+  "kernelversion": "4.15.0",
+  "lsbdistcodename": "bionic",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "lsbdistrelease": "18.04",
+  "lsbmajdistrelease": "18",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "memorysize": "985.29 MB",
+  "memoryfree": "823.46 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "823.46",
+  "memorytotal": "985.29 MB",
+  "netmask": "255.255.255.0",
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0",
+  "operatingsystemrelease": "18.04",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "physicalprocessorcount": 1,
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": "2",
+  "ps": "ps -ef",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "rubyversion": "2.5.1",
+  "selinux": "false",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "timezone": "UTC",
+  "uniqueid": "007f0101",
+  "uptime": "0:09 hours",
+  "uptime_days": 0,
+  "uptime_hours": 0,
+  "uptime_seconds": 545,
+  "virtual": "virtualbox",
+  "is_virtual": "true"
+}
diff --git a/facts/2.0/ubuntu-18.04-x86_64.facts b/facts/2.0/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..9f80a142
--- /dev/null
+++ b/facts/2.0/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,86 @@
+{
+  "gem_version": "~> 2.0.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "virtual": "virtualbox",
+  "is_virtual": "true",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.0.2",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": "false",
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.54 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.54",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "kernelrelease": "4.15.0-20-generic",
+  "uptime_days": 0,
+  "physicalprocessorcount": "1",
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "lsbdistid": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": "2",
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 547,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/2.1/ubuntu-18.04-x86_64.facts b/facts/2.1/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..67c0e3c7
--- /dev/null
+++ b/facts/2.1/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,96 @@
+{
+  "gem_version": "~> 2.1.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "mtu_enp0s3": "1500",
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": "65536",
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "virtual": "virtualbox",
+  "is_virtual": "true",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.1.0",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": "false",
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.56 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.56",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "kernelrelease": "4.15.0-20-generic",
+  "uptime_days": 0,
+  "physicalprocessorcount": "1",
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "partitions": {
+    "sda1": {
+      "uuid": "b5361850-7320-445b-b1c9-a8b294830484",
+      "size": "20969439",
+      "mount": "/",
+      "filesystem": "ext4\" PARTUUID=\"b448fb05-01"
+    }
+  },
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "lsbdistid": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": "2",
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 550,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/2.2/ubuntu-18.04-x86_64.facts b/facts/2.2/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..0e8bdfd2
--- /dev/null
+++ b/facts/2.2/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,127 @@
+{
+  "gem_version": "~> 2.2.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18.04",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "mtu_enp0s3": "1500",
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": "65536",
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "virtual": "virtualbox",
+  "is_virtual": "true",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.2.0",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": "false",
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.53 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.53",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "system_uptime": {
+    "seconds": 553,
+    "hours": 0,
+    "days": 0,
+    "uptime": "0:09 hours"
+  },
+  "processors": {
+    "models": [
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz"
+    ],
+    "count": 2,
+    "physicalcount": 1
+  },
+  "kernelrelease": "4.15.0-20-generic",
+  "os": {
+    "name": "Ubuntu",
+    "family": "Debian",
+    "release": {
+      "major": "18.04",
+      "full": "18.04"
+    },
+    "lsb": {
+      "distcodename": "bionic",
+      "distid": "Ubuntu",
+      "distdescription": "Ubuntu 18.04 LTS",
+      "distrelease": "18.04",
+      "majdistrelease": "18.04"
+    }
+  },
+  "uptime_days": 0,
+  "physicalprocessorcount": "1",
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "partitions": {
+    "sda1": {
+      "uuid": "b5361850-7320-445b-b1c9-a8b294830484",
+      "size": "20969439",
+      "mount": "/",
+      "filesystem": "ext4"
+    }
+  },
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": "2",
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "operatingsystemmajrelease": "18.04",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "gid": "root",
+  "lsbdistid": "Ubuntu",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 553,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/2.3/ubuntu-18.04-x86_64.facts b/facts/2.3/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..90f105f2
--- /dev/null
+++ b/facts/2.3/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,128 @@
+{
+  "gem_version": "~> 2.3.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18.04",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "mtu_enp0s3": 1500,
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": 65536,
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "rubyplatform": "x86_64-linux-gnu",
+  "virtual": "virtualbox",
+  "is_virtual": true,
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.3.0",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": false,
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.53 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.53",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "system_uptime": {
+    "seconds": 555,
+    "hours": 0,
+    "days": 0,
+    "uptime": "0:09 hours"
+  },
+  "processors": {
+    "models": [
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz"
+    ],
+    "count": 2,
+    "physicalcount": 1
+  },
+  "kernelrelease": "4.15.0-20-generic",
+  "os": {
+    "name": "Ubuntu",
+    "family": "Debian",
+    "release": {
+      "major": "18.04",
+      "full": "18.04"
+    },
+    "lsb": {
+      "distcodename": "bionic",
+      "distid": "Ubuntu",
+      "distdescription": "Ubuntu 18.04 LTS",
+      "distrelease": "18.04",
+      "majdistrelease": "18.04"
+    }
+  },
+  "uptime_days": 0,
+  "physicalprocessorcount": 1,
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "partitions": {
+    "sda1": {
+      "uuid": "b5361850-7320-445b-b1c9-a8b294830484",
+      "size": "20969439",
+      "mount": "/",
+      "filesystem": "ext4"
+    }
+  },
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": 2,
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "operatingsystemmajrelease": "18.04",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "gid": "root",
+  "lsbdistid": "Ubuntu",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 555,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/2.4/ubuntu-18.04-x86_64.facts b/facts/2.4/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..6777e309
--- /dev/null
+++ b/facts/2.4/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,129 @@
+{
+  "gem_version": "~> 2.4.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18.04",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "mtu_enp0s3": 1500,
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": 65536,
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "rubyplatform": "x86_64-linux-gnu",
+  "virtual": "virtualbox",
+  "is_virtual": true,
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.4.6",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": false,
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.67 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.67",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "system_uptime": {
+    "seconds": 558,
+    "hours": 0,
+    "days": 0,
+    "uptime": "0:09 hours"
+  },
+  "processors": {
+    "models": [
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz"
+    ],
+    "count": 2,
+    "physicalcount": 1
+  },
+  "kernelrelease": "4.15.0-20-generic",
+  "os": {
+    "name": "Ubuntu",
+    "family": "Debian",
+    "release": {
+      "major": "18.04",
+      "full": "18.04"
+    },
+    "lsb": {
+      "distcodename": "bionic",
+      "distid": "Ubuntu",
+      "distdescription": "Ubuntu 18.04 LTS",
+      "distrelease": "18.04",
+      "majdistrelease": "18.04"
+    }
+  },
+  "uptime_days": 0,
+  "physicalprocessorcount": 1,
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "partitions": {
+    "sda1": {
+      "uuid": "b5361850-7320-445b-b1c9-a8b294830484",
+      "size": "20969439",
+      "mount": "/",
+      "label": "cloudimg-rootfs",
+      "filesystem": "ext4"
+    }
+  },
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": 2,
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "operatingsystemmajrelease": "18.04",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "gid": "root",
+  "lsbdistid": "Ubuntu",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 558,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/2.5/ubuntu-18.04-x86_64.facts b/facts/2.5/ubuntu-18.04-x86_64.facts
new file mode 100644
index 00000000..7fbeda45
--- /dev/null
+++ b/facts/2.5/ubuntu-18.04-x86_64.facts
@@ -0,0 +1,129 @@
+{
+  "gem_version": "~> 2.5.0",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "uptime_hours": 0,
+  "timezone": "UTC",
+  "lsbdistdescription": "Ubuntu 18.04 LTS",
+  "kernel": "Linux",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "bios_vendor": "innotek GmbH",
+  "bios_version": "VirtualBox",
+  "bios_release_date": "12/01/2006",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "uuid": "DEB76A7E-FDC2-4EEC-8542-832F11CC631A",
+  "type": "Other",
+  "lsbmajdistrelease": "18.04",
+  "interfaces": "enp0s3,lo",
+  "ipaddress_enp0s3": "10.0.2.15",
+  "macaddress_enp0s3": "02:64:30:56:7d:5d",
+  "netmask_enp0s3": "255.255.255.0",
+  "mtu_enp0s3": 1500,
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": 65536,
+  "id": "root",
+  "domain": "example.com",
+  "blockdevice_sdb_size": 10485760,
+  "blockdevice_sdb_vendor": "VBOX",
+  "blockdevice_sdb_model": "HARDDISK",
+  "blockdevice_sda_size": 10737418240,
+  "blockdevice_sda_vendor": "VBOX",
+  "blockdevice_sda_model": "HARDDISK",
+  "blockdevices": "sda,sdb",
+  "hostname": "foo",
+  "lsbdistrelease": "18.04",
+  "uptime": "0:09 hours",
+  "rubyplatform": "x86_64-linux-gnu",
+  "virtual": "virtualbox",
+  "is_virtual": true,
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "facterversion": "2.5.1",
+  "netmask": "255.255.255.0",
+  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOxbdiIdeYY2BCEr+OzivbL0YhPsBG1QoHkowZKKEIbg1nGHBqXbQV7SCtdmcZ+QONgHNue8DAHEqp9LaOxF/BVc9rjypxaJGh0xzqB0MF2QiJQaZp4B2WlaI97ptHUmGRxCr/pfzqPH11bNtB+ES/kJv+4F21WI3B5bZcUawK5FAAAAFQDE+UQfjAkHXcFFBzgRCKL3x0SM4wAAAIEA2WA6UiBMhDyaH0mLD+QcLVCFmnh0uPmAomIV2SIaFgXShOb/RPdff55Qv5BLa29PTsc+hOu+3l+De4taWdnwT37b78I+p0omKhUnI3oL9q36KA/qeL69mHlVz2pakkyggiHCHgHNh7ckL1aC00/hpfEJunaa0sXFCJEfHWigwEMAAACBAJokMLhoq6dIIAuDwx2OxXaVN99Xa7Q/cBEcPUA1wMFo0rzdhixEoqpnWkYb84lZn7T/Iw0DA8hgVr474/JaTO5Jkwi9rXCsHIm3vmi9u4rRiE2dqwp6r4VhBDBnOQCmNJy4XixPaun3jyvvojlmKD+LoHGKYy+XXF3YRrY85Dep",
+  "sshfp_dsa": "SSHFP 2 1 666162d2f3db7264e766c04e259471760397660c\nSSHFP 2 2 5ee49d86bdab7004bc14977def1a1790ab2450eebd71d73238f38198b018e4f8",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBNdwSef8dOKjhCnwsnq8qDUJlpKAu4+9BLaXHGpyDq9Wuo4HRq1rR1pD5b6zVAkryenTAQE1D52i4R3b0PE3lxs35gYnycLfcb3bsYQoznNQCM72/fgCMcnRuac74LbgjvqFN6n68PX/fv47st+aY+1Phv1EcWlr8BmPAxB7nJiK7LfveZRsHPoovo+/0XqdrTfQGy9xIAyvETiTqs5hCUGXfAczqYKN1XAdelQhaYczXgpR3Ha1OSaTuVv0n6u2mcudym16rsdiPdEUVNsOPlL909jp4vxU4Mf8maXRlthNAJqGaDNek4VRn31xJc12lHb8I6sQjSdJrcGOBKdZt",
+  "sshfp_rsa": "SSHFP 1 1 ac45128cb3afa84f369f6a52c09bad0a7c675fad\nSSHFP 1 2 4005b69b41d5f95605d329df03e7566e7c7d50a413ebecf31dcf9d9b9282d410",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJIwnVmuDVO3LpIIQ7brM4pt1Lo//8QJjpE/FeoEVYEezgYQzLhozqg5vIA+g9m1hxSDPNOfKa9ark0sO18AJRE=",
+  "sshfp_ecdsa": "SSHFP 3 1 21dfdecdee66adbb64dcd017ff30d85a0a80ec2c\nSSHFP 3 2 b3ac16b556b9b7d89645260dc40f0f86f435e449a3f2e742fd92a7155bdf7028",
+  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIHUJAtz5pXl5rrberuXb8HeGNXV07lpf3y6nrAoh1HTX",
+  "sshfp_ed25519": "SSHFP 4 1 ac3db529294316abd818c237e97a7063ca7687c8\nSSHFP 4 2 be782e952c597fc935d971f1b89545769b4222687548b649e6fa9ca7160472d2",
+  "lsbdistcodename": "bionic",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "selinux": false,
+  "memorysize": "985.29 MB",
+  "memoryfree": "833.53 MB",
+  "swapsize": "0.00 MB",
+  "swapfree": "0.00 MB",
+  "swapsize_mb": "0.00",
+  "swapfree_mb": "0.00",
+  "memorysize_mb": "985.29",
+  "memoryfree_mb": "833.53",
+  "ipaddress": "10.0.2.15",
+  "osfamily": "Debian",
+  "kernelversion": "4.15.0",
+  "system_uptime": {
+    "seconds": 560,
+    "hours": 0,
+    "days": 0,
+    "uptime": "0:09 hours"
+  },
+  "processors": {
+    "models": [
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+      "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz"
+    ],
+    "count": 2,
+    "physicalcount": 1
+  },
+  "kernelrelease": "4.15.0-20-generic",
+  "os": {
+    "name": "Ubuntu",
+    "family": "Debian",
+    "release": {
+      "major": "18.04",
+      "full": "18.04"
+    },
+    "lsb": {
+      "distcodename": "bionic",
+      "distid": "Ubuntu",
+      "distdescription": "Ubuntu 18.04 LTS",
+      "distrelease": "18.04",
+      "majdistrelease": "18.04"
+    }
+  },
+  "uptime_days": 0,
+  "physicalprocessorcount": 1,
+  "uniqueid": "007f0101",
+  "kernelmajversion": "4.15",
+  "partitions": {
+    "sda1": {
+      "uuid": "b5361850-7320-445b-b1c9-a8b294830484",
+      "size": "20969439",
+      "mount": "/",
+      "label": "cloudimg-rootfs",
+      "filesystem": "ext4"
+    }
+  },
+  "architecture": "amd64",
+  "operatingsystem": "Ubuntu",
+  "processor0": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processor1": "Intel(R) Core(TM) i5-2500K CPU @ 3.30GHz",
+  "processorcount": 2,
+  "fqdn": "foo.example.com",
+  "macaddress": "02:64:30:56:7d:5d",
+  "operatingsystemmajrelease": "18.04",
+  "ps": "ps -ef",
+  "rubyversion": "2.5.1",
+  "operatingsystemrelease": "18.04",
+  "gid": "root",
+  "lsbdistid": "Ubuntu",
+  "rubysitedir": "/usr/local/lib/site_ruby/2.5.0",
+  "uptime_seconds": 560,
+  "network_enp0s3": "10.0.2.0",
+  "network_lo": "127.0.0.0"
+}
diff --git a/facts/Vagrantfile b/facts/Vagrantfile
index 5f39cbe9..61828ac0 100644
--- a/facts/Vagrantfile
+++ b/facts/Vagrantfile
@@ -86,6 +86,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
+  config.vm.define "ubuntu-18.04-x86_64" do |host|
+    host.vm.box = "ubuntu/bionic64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
   config.vm.define "centos-5-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-5.11-64-nocm"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"