diff --git a/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json
new file mode 100644
index 00000000..ff8f9622
--- /dev/null
+++ b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 506,
+      "ypos": 361,
+      "width": 32,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_part_fs_xfs_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png
new file mode 100644
index 00000000..5c31ecd5
Binary files /dev/null and b/needles/disk_custom_gui_xfs-anaconda_custom_part_fs_xfs_selected-20211011.png differ
diff --git a/templates.fif.json b/templates.fif.json
index 46b8013c..141c8b90 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -388,7 +388,7 @@
                 "ROOT_PASSWORD": "weakpassword"
             }
         },
-        "install_gui_standard_partition_ext4": {
+        "install_custom_gui_standard_partition_ext4": {
             "profiles": {
                 "rocky-dvd-iso-aarch64-*-aarch64": 40,
                 "rocky-dvd-iso-x86_64-*-64bit": 40,
@@ -412,14 +412,14 @@
                 "ROOT_PASSWORD": "weakpassword"
             }
         },
-        "install_blivet_xfs": {
+        "install_custom_gui_xfs": {
             "profiles": {
                 "rocky-universal-aarch64-*-aarch64": 40,
                 "rocky-universal-x86_64-*-64bit": 40,
                 "rocky-universal-x86_64-*-uefi": 41
             },
             "settings": {
-                "PARTITIONING": "custom_blivet_xfs",
+                "PARTITIONING": "custom_gui_xfs",
                 "POSTINSTALL": "disk_custom_xfs_postinstall",
                 "ROOT_PASSWORD": "weakpassword"
             }
diff --git a/tests/disk_custom_gui_xfs.pm b/tests/disk_custom_gui_xfs.pm
new file mode 100644
index 00000000..9d5351e7
--- /dev/null
+++ b/tests/disk_custom_gui_xfs.pm
@@ -0,0 +1,39 @@
+use base "anacondatest";
+use strict;
+use testapi;
+use anaconda;
+
+sub run {
+    my $self = shift;
+    # Go to INSTALLATION DESTINATION and ensure the disk is selected.
+    # Because PARTITIONING starts with 'custom', this will select custom-gui.
+    select_disks();
+    assert_and_click "anaconda_spoke_done";
+
+    if (get_var("UEFI")) {
+        # if we're running on UEFI, we need esp
+        custom_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');
+    }
+    if (get_var("OFW")) {
+        custom_add_partition(size => 4, filesystem => 'ppc_prep_boot');
+    }
+
+    custom_add_partition(filesystem => 'xfs', size => 512, mountpoint => '/boot');
+    custom_add_partition(filesystem => 'swap', size => 512, mountpoint => 'swap');
+    custom_add_partition(filesystem => 'xfs', mountpoint => '/');
+
+    assert_and_click "anaconda_spoke_done";
+    assert_and_click "anaconda_part_accept_changes";
+
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: