diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index 774b5508..f3f3f4a6 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -220,7 +220,8 @@ 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";
-        mouse_set(10, 10);
+        # move mouse to dehighlight the list
+        mouse_set(10, 100);
         assert_and_click "anaconda_custom_part_devicetype_$args{devicetype}";
     }
     # if no filesystem was specified or filesystem is already selected, do nothing
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.png b/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.png
deleted file mode 100644
index 482ecfbd..00000000
Binary files a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.json b/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.json
similarity index 66%
rename from needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.json
rename to needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.json
index 21c73c05..d2463170 100644
--- a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211006.json
+++ b/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.json
@@ -1,10 +1,10 @@
 {
   "area": [
     {
-      "xpos": 505,
-      "ypos": 295,
-      "width": 33,
-      "height": 23,
+      "xpos": 508,
+      "ypos": 299,
+      "width": 50,
+      "height": 14,
       "type": "match"
     }
   ],
diff --git a/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.png b/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.png
new file mode 100644
index 00000000..e0bbe1ec
Binary files /dev/null and b/needles/anaconda/partitioning/disk_custom_gui_lvm_ext4-anaconda_custom_part_devicetype_lvmlv-20211007.png differ
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.json b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.json
new file mode 100644
index 00000000..169aaf07
--- /dev/null
+++ b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "width": 131,
+      "type": "match",
+      "xpos": 352,
+      "ypos": 367,
+      "height": 22,
+      "click_point": {
+        "xpos": 131,
+        "ypos": 12
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "anaconda_custom_mountpoint"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.png b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.png
new file mode 100644
index 00000000..1b63dd66
Binary files /dev/null and b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_mountpoint-20211007.png differ
diff --git a/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.json b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.json
new file mode 100644
index 00000000..586f36dd
--- /dev/null
+++ b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "ypos": 404,
+      "height": 24,
+      "xpos": 352,
+      "width": 134,
+      "type": "match",
+      "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/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.png b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.png
new file mode 100644
index 00000000..7296a20b
Binary files /dev/null and b/needles/anaconda/partitioning/disk_custom_lvm_ext4-anaconda_custom_size_unit-20211007.png differ