diff --git a/builder/templates/centos-8.2.index-fragment b/builder/templates/centos-8.2.index-fragment
new file mode 100644
index 000000000..336d4c369
--- /dev/null
+++ b/builder/templates/centos-8.2.index-fragment
@@ -0,0 +1,19 @@
+[centos-8.2]
+name=CentOS 8.2
+osinfo=centos8.2
+arch=x86_64
+file=centos-8.2.xz
+checksum[sha512]=22ecd8a97321094178592862eb47ae7552bbafbbd0d7c03c10da8eadab9bcd9dafd99f048d7520278507839ee47b16bec54f0f70ad7c8402a5ff643e62b9ae5a
+format=raw
+size=6442450944
+compressed_size=379922752
+expand=/dev/sda4
+notes=CentOS 8.2
+ 
+ This CentOS image contains only unmodified @Core group packages.
+ 
+ This template was generated by a script in the libguestfs source tree:
+     builder/templates/make-template.ml
+ Associated files used to prepare this template can be found in the
+ same directory.
+
diff --git a/builder/templates/centos-8.2.ks b/builder/templates/centos-8.2.ks
new file mode 100644
index 000000000..d38b2f789
--- /dev/null
+++ b/builder/templates/centos-8.2.ks
@@ -0,0 +1,30 @@
+# Kickstart file for centos-8.2
+# Generated by libguestfs.git/builder/templates/make-template.ml
+
+install
+text
+reboot
+lang en_US.UTF-8
+keyboard us
+network --bootproto dhcp
+rootpw builder
+firewall --enabled --ssh
+timezone --utc America/New_York
+selinux --enforcing
+
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH"
+
+url --url="http://mirror.centos.org/centos-8/8/BaseOS/x86_64/os"
+
+zerombr
+clearpart --all --initlabel --disklabel=gpt
+autopart --type=plain
+
+# Halt the system once configuration has finished.
+poweroff
+
+%packages
+@core
+%end
+
+# EOF
diff --git a/builder/templates/centos-8.2.virt-install-cmd b/builder/templates/centos-8.2.virt-install-cmd
new file mode 100644
index 000000000..4c98ab65f
--- /dev/null
+++ b/builder/templates/centos-8.2.virt-install-cmd
@@ -0,0 +1,20 @@
+# This is the virt-install command which was used to create
+# the virt-builder template 'centos-8.2'
+# NB: This file is generated for documentation purposes ONLY!
+# This script was never run, and is not intended to be run.
+
+'virt-install' \
+    '--transient' \
+    '--name=tmp-y2rkkuka' \
+    '--ram=4096' \
+    '--arch=x86_64' \
+    '--cpu=host' \
+    '--vcpus=4' \
+    '--os-variant=rhel8.0' \
+    '--initrd-inject=centos-8.2.ks' \
+    '--extra-args=ks=file:/centos-8.2.ks  console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \
+    '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-y2rkkuka.img,size=6,format=raw' \
+    '--location=http://mirror.centos.org/centos-8/8/BaseOS/x86_64/kickstart' \
+    '--serial=pty' \
+    '--nographics' 
+
diff --git a/builder/templates/rhel-8.2.ks b/builder/templates/rhel-8.2.ks
new file mode 100644
index 000000000..c6f18e937
--- /dev/null
+++ b/builder/templates/rhel-8.2.ks
@@ -0,0 +1,29 @@
+# Kickstart file for rhel-8.2
+# Generated by libguestfs.git/builder/templates/make-template.ml
+
+install
+text
+reboot
+lang en_US.UTF-8
+keyboard us
+network --bootproto dhcp
+rootpw builder
+firewall --enabled --ssh
+timezone --utc America/New_York
+selinux --enforcing
+
+bootloader --location=mbr --append="console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH"
+
+
+zerombr
+clearpart --all --initlabel --disklabel=gpt
+autopart --type=plain
+
+# Halt the system once configuration has finished.
+poweroff
+
+%packages
+@core
+%end
+
+# EOF
diff --git a/builder/templates/rhel-8.2.virt-install-cmd b/builder/templates/rhel-8.2.virt-install-cmd
new file mode 100644
index 000000000..e1a15d76b
--- /dev/null
+++ b/builder/templates/rhel-8.2.virt-install-cmd
@@ -0,0 +1,20 @@
+# This is the virt-install command which was used to create
+# the virt-builder template 'rhel-8.2'
+# NB: This file is generated for documentation purposes ONLY!
+# This script was never run, and is not intended to be run.
+
+'virt-install' \
+    '--transient' \
+    '--name=tmp-97b48a0f' \
+    '--ram=4096' \
+    '--arch=x86_64' \
+    '--cpu=host' \
+    '--vcpus=4' \
+    '--os-variant=rhel8.0' \
+    '--initrd-inject=rhel-8.2.ks' \
+    '--extra-args=ks=file:/rhel-8.2.ks  console=tty0 console=ttyS0,115200 rd_NO_PLYMOUTH' \
+    '--disk=/home/rjones/d/libguestfs/builder/templates/tmp-97b48a0f.img,size=6,format=raw' \
+    '--location=http://download.eng.bos.redhat.com/released/rhel-6-7-8/rhel-8/RHEL-8/8.2.0/BaseOS/x86_64/os' \
+    '--serial=pty' \
+    '--nographics' 
+