diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index f3f3f4a6..145a8191 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -190,20 +190,24 @@ sub custom_add_partition {
     );
     $args{devicetype} = "raid" if $args{raid1};
 
-    assert_and_click "anaconda_custom_part_add";
-
-    if ($args{mountpoint}) {
-        assert_and_click "anaconda_custom_mountpoint";
-        type_safely $args{mountpoint};
-        # esc to dismiss the dropdown that appears when we add a mountpoint
-        send_key "esc";
-    }
+    # send tab until 'add' button is selected, then press
+    # the number of tabs needed seems to depend on whether a partition has already been added
+    send_key_until_needlematch("anaconda_custom_part_add", "tab");
+    send_key "spc";
+    assert_screen "anaconda_custom_mountpoint";
+    type_safely $args{mountpoint};
+    send_key "tab";
+    send_key "tab";
+    send_key "tab";
+    assert_screen "anaconda_custom_size";
+    # if size is not provided, leave empty to use the remaining disk space
     if ($args{size}) {
-        assert_and_click "anaconda_custom_size";
-        # size input can contain whole set of different values, so we can't match it with needle
         type_safely $args{size};
     }
-    assert_and_click "anaconda_custom_btn_add_mountpoint";
+    send_key "tab";
+    send_key "tab";
+    assert_screen "anaconda_custom_btn_add_mountpoint";
+    send_key "spc";
 
 #    if ($args{raid1}) {
 #        # for RAID1, two disks should be selected
@@ -219,15 +223,17 @@ sub custom_add_partition {
 
     # if no devicetype was specified or devicetype is already selected, do nothing
     if (($args{devicetype} && !check_screen("anaconda_custom_part_fs_$args{devicetype}_selected", 5))) {
-        assert_and_click "anaconda_custom_part_devicetype";
-        # move mouse to dehighlight the list
-        mouse_set(10, 100);
-        assert_and_click "anaconda_custom_part_devicetype_$args{devicetype}";
+        send_key_until_needlematch("anaconda_custom_part_devicetype_selected", "tab");
+        send_key "spc";
+        send_key_until_needlematch("anaconda_custom_part_devicetype_$args{devicetype}", "down");
+        send_key "spc";
     }
     # if no filesystem was specified or filesystem is already selected, do nothing
     if ($args{filesystem} && !check_screen("anaconda_custom_part_fs_$args{filesystem}_selected", 5)) {
-        assert_and_click "anaconda_custom_part_fs";
-        assert_and_click "anaconda_custom_part_fs_$args{filesystem}";
+        send_key_until_needlematch("anaconda_custom_part_fs_selected", "tab");
+        send_key "spc";
+        send_key_until_needlematch("anaconda_custom_part_fs_$args{filesystem}_selected", "down");
+        send_key "spc";
     }
     # select "free space" in custom-gui if it exists, so we could run this function again to add another partition
     if (check_screen("anaconda_custom_free_space", 15)) {
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.png
deleted file mode 100644
index cc726cbc..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json
new file mode 100644
index 00000000..2721c882
--- /dev/null
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 33,
+      "ypos": 617,
+      "width": 38,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_custom_part_add"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png
new file mode 100644
index 00000000..d6ea066f
Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211008.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json
index 63b5f2aa..6d75f1f3 100644
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype-20211006.json
@@ -1,21 +1,21 @@
-{
-  "area": [
-    {
-      "height": 34,
-      "ypos": 263,
-      "type": "match",
-      "width": 168,
-      "xpos": 497,
-      "click_point": {
-        "xpos": 118,
-        "ypos": 34
-      }
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_custom_part_devicetype"
-  ]
+{
+  "area": [
+    {
+      "height": 34,
+      "ypos": 263,
+      "type": "match",
+      "width": 168,
+      "xpos": 497,
+      "click_point": {
+        "xpos": 118,
+        "ypos": 34
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_part_devicetype"
+  ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.png
deleted file mode 100644
index e0bbe1ec..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json
similarity index 65%
rename from needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json
index d2463170..b1fa9c96 100644
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211007.json
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.json
@@ -1,17 +1,17 @@
-{
-  "area": [
-    {
-      "xpos": 508,
-      "ypos": 299,
-      "width": 50,
-      "height": 14,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_custom_part_devicetype_lvmlv"
-  ]
-}
\ No newline at end of file
+{
+  "area": [
+    {
+      "xpos": 509,
+      "ypos": 300,
+      "width": 48,
+      "height": 13,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_part_devicetype_lvmlv"
+  ]
+}
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png
new file mode 100644
index 00000000..32dde2c5
Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_lvmlv-20211008.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json
new file mode 100644
index 00000000..0ab95f7c
--- /dev/null
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 503,
+      "ypos": 269,
+      "width": 76,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_part_devicetype_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png
new file mode 100644
index 00000000..9317a03a
Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_devicetype_selected-20211010.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.json
deleted file mode 100644
index 00b8d1cb..00000000
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "width": 114,
-      "height": 30,
-      "click_point": {
-        "xpos": 91.5,
-        "ypos": 30
-      },
-      "xpos": 494,
-      "ypos": 327
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_custom_part_fs"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.png
deleted file mode 100644
index 5ff9175c..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs-20211006.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.json
deleted file mode 100644
index 793300f2..00000000
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 494,
-      "ypos": 347,
-      "width": 140,
-      "height": 34,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_custom_part_fs_efi_filesystem"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.png
deleted file mode 100644
index dce08099..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_efi_filesystem-20211006.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.png
deleted file mode 100644
index c0da389b..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json
similarity index 51%
rename from needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.json
rename to needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json
index d6c42202..979f6f5a 100644
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_add-20211005.json
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.json
@@ -1,17 +1,17 @@
 {
   "area": [
     {
-      "ypos": 622,
-      "width": 30,
-      "xpos": 36,
+      "height": 26,
       "type": "match",
-      "height": 26
+      "ypos": 351,
+      "width": 71,
+      "xpos": 504
     }
   ],
   "properties": [],
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-english",
-    "anaconda_custom_part_add"
+    "anaconda_custom_part_fs_selected"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png
new file mode 100644
index 00000000..89e53d88
Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_selected-20211010.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.png
deleted file mode 100644
index a25b4e84..00000000
Binary files a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json
new file mode 100644
index 00000000..7a565e11
--- /dev/null
+++ b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "ypos": 404,
+      "type": "match",
+      "xpos": 352,
+      "width": 112,
+      "height": 24,
+      "click_point": {
+        "xpos": 134,
+        "ypos": 10
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_size"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png
new file mode 100644
index 00000000..70d69840
Binary files /dev/null and b/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_size-20211010.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.json b/needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json
similarity index 54%
rename from needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.json
rename to needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json
index d3947cc3..8c7a58c5 100644
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_ext4-20211005.json
+++ b/needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.json
@@ -2,9 +2,9 @@
   "area": [
     {
       "xpos": 507,
-      "ypos": 271,
-      "width": 29,
-      "height": 17,
+      "ypos": 359,
+      "width": 120,
+      "height": 15,
       "type": "match"
     }
   ],
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-english",
-    "anaconda_custom_part_fs_ext4"
+    "anaconda_custom_part_fs_efi_filesystem_selected"
   ]
 }
\ No newline at end of file
diff --git a/needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png b/needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png
new file mode 100644
index 00000000..9e8cab1a
Binary files /dev/null and b/needles/rocky-anaconda_custom_part_fs_efi_filesystem_selected-20211010.png differ
diff --git a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.json b/needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json
similarity index 50%
rename from needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.json
rename to needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json
index dfd81d68..68890ca6 100644
--- a/needles/anaconda/partitioning/custom-gui/rocky-anaconda_custom_part_fs_swap-20211006.json
+++ b/needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.json
@@ -1,10 +1,10 @@
 {
   "area": [
     {
-      "xpos": 504,
-      "ypos": 360,
-      "width": 49,
-      "height": 18,
+      "xpos": 509,
+      "ypos": 275,
+      "width": 36,
+      "height": 10,
       "type": "match"
     }
   ],
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-english",
-    "anaconda_custom_part_fs_swap"
+    "anaconda_custom_part_fs_ext4_selected"
   ]
 }
\ No newline at end of file
diff --git a/needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png b/needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png
new file mode 100644
index 00000000..fe8aa594
Binary files /dev/null and b/needles/rocky-anaconda_custom_part_fs_ext4_selected-20211010.png differ
diff --git a/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.json b/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.json
new file mode 100644
index 00000000..665b7d74
--- /dev/null
+++ b/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 506,
+      "ypos": 364,
+      "width": 45,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_part_fs_swap_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.png b/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.png
new file mode 100644
index 00000000..c361e3d7
Binary files /dev/null and b/needles/rocky-anaconda_custom_part_fs_swap_selected-20211010.png differ