diff --git a/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.json b/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.json
new file mode 100644
index 00000000..5c2c861d
--- /dev/null
+++ b/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 304,
+      "width": 35,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_main_hub",
+    "anaconda_main_hub_keyboard_layout_incomplete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.png b/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.png
new file mode 100644
index 00000000..82830ad6
Binary files /dev/null and b/needles/anaconda/main_hub/keyboard_layout_incomplete-20240306.png differ
diff --git a/needles/anaconda/main_hub/time_date_incomplete-20240306.json b/needles/anaconda/main_hub/time_date_incomplete-20240306.json
new file mode 100644
index 00000000..39f5cd59
--- /dev/null
+++ b/needles/anaconda/main_hub/time_date_incomplete-20240306.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 440,
+      "width": 35,
+      "height": 38,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_main_hub_time_date_incomplete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/time_date_incomplete-20240306.png b/needles/anaconda/main_hub/time_date_incomplete-20240306.png
new file mode 100644
index 00000000..0db4b7db
Binary files /dev/null and b/needles/anaconda/main_hub/time_date_incomplete-20240306.png differ
diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm
index d5340f55..98c8e628 100644
--- a/tests/_boot_to_anaconda.pm
+++ b/tests/_boot_to_anaconda.pm
@@ -6,6 +6,22 @@ use utils;
 use tapnet;
 use anaconda;
 
+sub _handle_incomplete_hub {
+    if (match_has_tag "anaconda_main_hub_keyboard_layout_incomplete") {
+        # workaround IoT/osbuild issue
+        # https://github.com/osbuild/images/issues/309
+        # by visiting the incomplete spokes
+        assert_and_click "anaconda_main_hub_keyboard_layout_incomplete";
+        wait_still_screen 3;
+        assert_and_click "anaconda_spoke_done";
+        assert_and_click "anaconda_main_hub_time_date_incomplete";
+        wait_still_screen 3;
+        assert_and_click "anaconda_spoke_done";
+        wait_still_screen 3;
+        send_key "shift-tab";
+    }
+}
+
 sub run {
     my $self = shift;
     if (get_var("IS_PXE")) {
@@ -183,6 +199,7 @@ sub run {
                 }
                 else {
                     # this is when the hub appeared already, we're done
+                    _handle_incomplete_hub;
                     return;
                 }
             }
@@ -201,6 +218,7 @@ sub run {
             # show by now it never will, so we'll just wait for the
             # hub to show up.
             assert_screen "anaconda_main_hub", 900;
+            _handle_incomplete_hub;
         }
     }
 }