diff --git a/needles/anaconda_install_destination_select_disk_1.json b/needles/anaconda_install_destination_select_disk_1.json
index b219dddb..3b732b45 100644
--- a/needles/anaconda_install_destination_select_disk_1.json
+++ b/needles/anaconda_install_destination_select_disk_1.json
@@ -1,24 +1,17 @@
 {
-  "tags": [
-    "anaconda_install_destination_select_disk_1",
-    "ENV-DISTRI-fedora",
-    "ENV-INSTLANG-en_US",
-    "ENV-FLAVOR-server"
-  ],
   "area": [
     {
+      "xpos": 56,
+      "width": 134,
       "type": "match",
-      "width": 64,
-      "xpos": 86,
-      "ypos": 177,
-      "height": 66
-    },
-    {
-      "type": "match",
-      "height": 30,
-      "xpos": 58,
-      "ypos": 274,
-      "width": 135
+      "height": 24,
+      "ypos": 289
     }
+  ],
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server",
+    "ENV-INSTLANG-en_US",
+    "anaconda_install_destination_select_disk_1"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_1.png b/needles/anaconda_install_destination_select_disk_1.png
index adfacdd6..672ba54d 100644
Binary files a/needles/anaconda_install_destination_select_disk_1.png and b/needles/anaconda_install_destination_select_disk_1.png differ
diff --git a/needles/anaconda_rawhide_accept_fate.json b/needles/anaconda_rawhide_accept_fate.json
new file mode 100644
index 00000000..09a8cdf5
--- /dev/null
+++ b/needles/anaconda_rawhide_accept_fate.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server",
+    "ENV-INSTLANG-en_US",
+    "anaconda_rawhide_accept_fate"
+  ],
+  "area": [
+    {
+      "xpos": 618,
+      "ypos": 463,
+      "width": 162,
+      "height": 38,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_rawhide_accept_fate.png b/needles/anaconda_rawhide_accept_fate.png
new file mode 100644
index 00000000..7f980ad3
Binary files /dev/null and b/needles/anaconda_rawhide_accept_fate.png differ
diff --git a/needles/anaconda_select_install_lang_english_filtered.json b/needles/anaconda_select_install_lang_english_filtered.json
index 696e51a4..5565809c 100644
--- a/needles/anaconda_select_install_lang_english_filtered.json
+++ b/needles/anaconda_select_install_lang_english_filtered.json
@@ -1,11 +1,18 @@
 {
   "area": [
     {
-      "xpos": 203,
-      "ypos": 188,
-      "height": 100,
-      "width": 349,
-      "type": "match"
+      "width": 103,
+      "xpos": 207,
+      "height": 45,
+      "type": "match",
+      "ypos": 196
+    },
+    {
+      "width": 79,
+      "height": 54,
+      "type": "match",
+      "xpos": 483,
+      "ypos": 195
     }
   ],
   "tags": [
diff --git a/needles/anaconda_select_install_lang_english_filtered.png b/needles/anaconda_select_install_lang_english_filtered.png
index 36bdec45..a2f8f128 100644
Binary files a/needles/anaconda_select_install_lang_english_filtered.png and b/needles/anaconda_select_install_lang_english_filtered.png differ
diff --git a/needles/anaconda_select_install_lang_english_selected.json b/needles/anaconda_select_install_lang_english_selected.json
index 6f0500cb..556474b3 100644
--- a/needles/anaconda_select_install_lang_english_selected.json
+++ b/needles/anaconda_select_install_lang_english_selected.json
@@ -1,23 +1,17 @@
 {
   "tags": [
     "anaconda_select_install_lang_english_selected",
-    "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
-    "ENV-INSTLANG-en_US"
+    "ENV-INSTLANG-en_US",
+    "ENV-OFW-1",
+    "ENV-FLAVOR-server"
   ],
   "area": [
     {
-      "type": "match",
-      "height": 51,
-      "ypos": 194,
-      "xpos": 200,
-      "width": 356
-    },
-    {
+      "height": 70,
       "type": "match",
       "xpos": 593,
       "ypos": 190,
-      "height": 70,
       "width": 349
     }
   ]
diff --git a/needles/anaconda_select_install_lang_english_selected.png b/needles/anaconda_select_install_lang_english_selected.png
index b7a49a59..dded83e0 100644
Binary files a/needles/anaconda_select_install_lang_english_selected.png and b/needles/anaconda_select_install_lang_english_selected.png differ
diff --git a/tests/_wait_for_login_screen.pm b/tests/_wait_for_login_screen.pm
index 894247f2..cfbc6c9f 100644
--- a/tests/_wait_for_login_screen.pm
+++ b/tests/_wait_for_login_screen.pm
@@ -6,7 +6,7 @@ sub run {
 
     # If KICKSTART is set, then the wait_time needs to
     #  consider the install time
-    my $wait_time = get_var("KICKSTART") ? 600 : 300;
+    my $wait_time = get_var("KICKSTART") ? 1800 : 300;
 
     # Reboot and wait for the text login
     assert_screen "clean_install_login", $wait_time;