diff --git a/lib/utils.pm b/lib/utils.pm
index 3b5f8cd4..327ac645 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -693,10 +693,9 @@ sub gnome_initial_setup {
     # https://bugzilla.gnome.org/show_bug.cgi?id=794825
     @nexts = grep {$_ ne 'software'} @nexts;
 
-    # note: in g-i-s 3.37.91 and later, the first screen has a "Start
-    # Setup" button, not a "Next" button. For code simplicity, we just
-    # have a needle for that button which has the next_button tag
-    assert_screen ["next_button", "auth_required"], $args{timeout};
+    # note: in g-i-s 3.37.91 and later, the first screen in systemwide
+    # mode has a "Start Setup" button, not a "Next" button
+    assert_screen ["next_button", "start_setup", "auth_required"], $args{timeout};
     # workaround auth dialog appearing to change timezone even
     # though timezone screen is disabled
     if (match_has_tag("auth_required")) {
diff --git a/needles/gnome/next_button-startsetup-20200818.json b/needles/gnome/next_button-startsetup-20200818.json
index 0c1226be..53dcd312 100644
--- a/needles/gnome/next_button-startsetup-20200818.json
+++ b/needles/gnome/next_button-startsetup-20200818.json
@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "next_button",
+    "start_setup",
     "LANGUAGE-english"
   ]
-}
\ No newline at end of file
+}