diff --git a/lib/utils.pm b/lib/utils.pm
index 85e5d92e..c3296578 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -1267,13 +1267,11 @@ sub check_prerelease {
 
 sub check_version {
     # This function checks if the correct version is display during installation
-    # in Anaconda, i.e. nonlive media showing Rawhide when Rawhide and version numbers
-    # when not Rawhide, while live media always showing version numbers.
+    # in Anaconda, it only looks at the major version, as these needles should
+    # not change between the major versions.
 
     my $version = lc(get_var('VERSION'));
-    if ($version eq 'rawhide' && get_var('LIVE')) {
-        $version = get_var('RAWREL');
-    }
+    $version =~ s/\..+$//;
     assert_screen "version_${version}_ident";
 }
 
diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.json b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.json
new file mode 100644
index 00000000..d49f4e47
--- /dev/null
+++ b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "ypos": 634,
+      "type": "match",
+      "height": 14,
+      "xpos": 706,
+      "width": 305
+    },
+    {
+      "type": "match",
+      "width": 105,
+      "height": 14,
+      "xpos": 873,
+      "ypos": 698
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-japanese",
+    "anaconda_install_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.png b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.png
new file mode 100644
index 00000000..e0ef6e46
Binary files /dev/null and b/needles/anaconda/install_process/japanese/rocky-install_done_reboot_japanese-20211113.png differ
diff --git a/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8.4_ident_arabic-20210822.json b/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.json
similarity index 84%
rename from needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8.4_ident_arabic-20210822.json
rename to needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.json
index 76e0eeff..64b1974f 100644
--- a/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8.4_ident_arabic-20210822.json
+++ b/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.json
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-arabic",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8.4_ident_arabic-20210822.png b/needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.png
similarity index 100%
rename from needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8.4_ident_arabic-20210822.png
rename to needles/anaconda/main_hub/arabic/rocky-boot_to_anaconda-version_8_ident_arabic-20210822.png
diff --git a/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8.4_ident_french-20210822.json b/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.json
similarity index 84%
rename from needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8.4_ident_french-20210822.json
rename to needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.json
index 3b49a117..72c55e41 100644
--- a/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8.4_ident_french-20210822.json
+++ b/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.json
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-french",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8.4_ident_french-20210822.png b/needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.png
similarity index 100%
rename from needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8.4_ident_french-20210822.png
rename to needles/anaconda/main_hub/french/rocky-boot_to_anaconda-version_8_ident_french-20210822.png
diff --git a/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8.4_ident_japanese-20210822.json b/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.json
similarity index 84%
rename from needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8.4_ident_japanese-20210822.json
rename to needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.json
index 916711cb..5b3e1f32 100644
--- a/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8.4_ident_japanese-20210822.json
+++ b/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.json
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-japanese",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8.4_ident_japanese-20210822.png b/needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.png
similarity index 100%
rename from needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8.4_ident_japanese-20210822.png
rename to needles/anaconda/main_hub/japanese/rocky-boot_to_anaconda-version_8_ident_japanese-20210822.png
diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json
deleted file mode 100644
index 37281c6a..00000000
--- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 777,
-      "ypos": 12,
-      "width": 231,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "version_8.4_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.json
similarity index 92%
rename from needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json
rename to needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.json
index b3a59037..e3e610a2 100644
--- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json
+++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.json
@@ -13,4 +13,4 @@
     "ENV-DISTRI-rocky",
     "version_8_ident"
   ]
-}
+}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.png b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.png
similarity index 100%
rename from needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.png
rename to needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident-20210805.png
diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.png b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.png
deleted file mode 100644
index 98ff7ee9..00000000
Binary files a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.png and /dev/null differ
diff --git a/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8.4_ident_russian-20210822.json b/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.json
similarity index 84%
rename from needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8.4_ident_russian-20210822.json
rename to needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.json
index 643f88dc..da4293b6 100644
--- a/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8.4_ident_russian-20210822.json
+++ b/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.json
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-russian",
-    "version_8.4_ident"
+    "version_8_ident"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8.4_ident_russian-20210822.png b/needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.png
similarity index 100%
rename from needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8.4_ident_russian-20210822.png
rename to needles/anaconda/main_hub/russian/rocky-boot_to_anaconda-version_8_ident_russian-20210822.png
diff --git a/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.json b/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.json
new file mode 100644
index 00000000..6698720f
--- /dev/null
+++ b/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.json
@@ -0,0 +1,21 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 16,
+      "xpos": 778,
+      "ypos": 361,
+      "click_point": {
+        "xpos": 17,
+        "ypos": 1.5
+      },
+      "width": 88
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-french",
+    "anaconda_main_hub_network_host_name_not_connected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.png b/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.png
new file mode 100644
index 00000000..15628762
Binary files /dev/null and b/needles/anaconda/network/rocky-network_host_name_not_connected_french-20211113.png differ
diff --git a/needles/cockpit/rocky-logs_priority_text-20211113.json b/needles/cockpit/rocky-logs_priority_text-20211113.json
new file mode 100644
index 00000000..c2c2640f
--- /dev/null
+++ b/needles/cockpit/rocky-logs_priority_text-20211113.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 257,
+      "height": 12,
+      "width": 60,
+      "xpos": 387,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_logs_priority_text"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-logs_priority_text-20211113.png b/needles/cockpit/rocky-logs_priority_text-20211113.png
new file mode 100644
index 00000000..c7f5ab81
Binary files /dev/null and b/needles/cockpit/rocky-logs_priority_text-20211113.png differ