diff --git a/desktop-8.ks b/desktop-8.ks
new file mode 100644
index 0000000..7dac1b9
--- /dev/null
+++ b/desktop-8.ks
@@ -0,0 +1,21 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
diff --git a/desktopencrypt-8-aarch64.ks b/desktopencrypt-8-aarch64.ks
new file mode 100644
index 0000000..7a4d71e
--- /dev/null
+++ b/desktopencrypt-8-aarch64.ks
@@ -0,0 +1,17 @@
+bootloader --location=mbr --append="console=tty0 quiet"
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
diff --git a/desktopencrypt-8.ks b/desktopencrypt-8.ks
new file mode 100644
index 0000000..3e54a89
--- /dev/null
+++ b/desktopencrypt-8.ks
@@ -0,0 +1,17 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart --encrypted --passphrase=weakpassword
+rootpw --plaintext weakpassword
+user --name=test --password=weakpassword --plaintext
+firstboot --enable
+poweroff
+
+%packages
+@^workstation-product-environment
+-selinux-policy-minimum
+%end
diff --git a/desktopencrypt-aarch64.ks b/desktopencrypt-aarch64.ks
index c34a326..6dcae4e 100644
--- a/desktopencrypt-aarch64.ks
+++ b/desktopencrypt-aarch64.ks
@@ -1,6 +1,6 @@
 bootloader --location=mbr --append="console=tty0 quiet"
 network --bootproto=dhcp
-url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
+url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/"
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
diff --git a/hdds.json b/hdds.json
index bdf7aa4..0c766cb 100644
--- a/hdds.json
+++ b/hdds.json
@@ -52,7 +52,7 @@
             ]
         },
         {
-            "name" : "ks",
+            "name" : "ks-8",
             "size" : "100M",
             "parts" : [
                 {
@@ -66,7 +66,36 @@
                 {
                     "part" : "1",
                     "target" : "/root-user-crypted-net.ks",
-                    "source" : "root-user-crypted-net.ks"
+                    "source" : "root-user-crypted-net-8.ks"
+                },
+                {
+                    "part" : "1",
+                    "target" : "/freeipa.ks",
+                    "source" : "freeipa.ks"
+                },
+                {
+                    "part" : "1",
+                    "target" : "/freeipaclient.ks",
+                    "source" : "freeipaclient.ks"
+                }
+            ]
+        },
+        {
+            "name" : "ks-9",
+            "size" : "100M",
+            "parts" : [
+                {
+                    "filesystem" : "ext4",
+                    "type" : "p",
+                    "start" : "4096",
+                    "end" : "-1"
+                }
+            ],
+            "uploads" : [
+                {
+                    "part" : "1",
+                    "target" : "/root-user-crypted-net.ks",
+                    "source" : "root-user-crypted-net-9.ks"
                 },
                 {
                     "part" : "1",
@@ -169,7 +198,7 @@
                 "8" : ["x86_64", "aarch64"],
                 "9" : ["x86_64", "aarch64"]
             },
-            "size" : "15"
+            "size" : "30"
         }
     ],
     "renames" : []
diff --git a/minimal-8.ks b/minimal-8.ks
new file mode 100644
index 0000000..fe12163
--- /dev/null
+++ b/minimal-8.ks
@@ -0,0 +1,14 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+
+%packages
+@core
+%end
diff --git a/minimal-uefi-8.ks b/minimal-uefi-8.ks
new file mode 100644
index 0000000..d415c5d
--- /dev/null
+++ b/minimal-uefi-8.ks
@@ -0,0 +1,18 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+
+%packages
+@core
+%end
+
+%post
+touch $INSTALL_ROOT/home/home_preserved
+%end
diff --git a/server-8.ks b/server-8.ks
new file mode 100644
index 0000000..e30eb92
--- /dev/null
+++ b/server-8.ks
@@ -0,0 +1,16 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+user --name=test --password=weakpassword --plaintext
+poweroff
+
+%packages
+@^server-product-environment
+plymouth-system-theme
+%end
diff --git a/support-8.ks b/support-8.ks
new file mode 100644
index 0000000..5051098
--- /dev/null
+++ b/support-8.ks
@@ -0,0 +1,19 @@
+bootloader --location=mbr
+network --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
+# use epel to keep scsi-target-utils instead of targetcli
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+rootpw weakpassword
+poweroff
+
+%packages
+@core
+targetcli
+nfs-utils
+dnsmasq
+%end
diff --git a/support.ks b/support.ks
index c3d60fe..e39f505 100644
--- a/support.ks
+++ b/support.ks
@@ -1,7 +1,7 @@
 bootloader --location=mbr
 network --bootproto=dhcp
 url --url="https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/"
-#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/8/Everything/x86_64/"
+#repo --name="epel" --baseurl="http://mirrors.kernel.org/fedora-epel/9/Everything/x86_64/"
 # use epel to keep scsi-target-utils instead of targetcli
 lang en_US.UTF-8
 keyboard us
diff --git a/uploads/root-user-crypted-net-8.ks b/uploads/root-user-crypted-net-8.ks
new file mode 100644
index 0000000..b77295b
--- /dev/null
+++ b/uploads/root-user-crypted-net-8.ks
@@ -0,0 +1,17 @@
+bootloader --location=mbr
+network --device=link --activate --bootproto=dhcp
+url --url="https://download.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/"
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+clearpart --all
+autopart
+
+rootpw --iscrypted $6$ansiogjasd0io9u3$9E1vMbLbXW14grtguedFGVjvhyBz1T.KIA3MJl1SWnGbtTpiXIAjbazIQAUKRNkNIEmd3mI0NCkFIVBrN41fZ.
+user --name=test --password=$6$ansioasgfgadsghd$O8O8zom5hx.V8ib1jV91xuvIgYqA2b99tzhibkk3URITdCrDtbRbwJjMK1kW4l0/9W0brraGC4NUBtDoGv4Kl. --iscrypted
+
+reboot
+
+%packages
+@core
+%end
diff --git a/uploads/root-user-crypted-net.ks b/uploads/root-user-crypted-net-9.ks
similarity index 100%
rename from uploads/root-user-crypted-net.ks
rename to uploads/root-user-crypted-net-9.ks