diff --git a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.json b/needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.json
similarity index 50%
rename from needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.json
rename to needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.json
index 89ef1990..63a34bf8 100644
--- a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.json
+++ b/needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.json
@@ -1,10 +1,10 @@
 {
   "area": [
     {
-      "width": 45,
-      "height": 17,
-      "xpos": 411,
-      "ypos": 134,
+      "xpos": 650,
+      "ypos": 743,
+      "width": 335,
+      "height": 18,
       "type": "match"
     }
   ],
@@ -12,6 +12,6 @@
   "tags": [
     "ENV-DISTRI-rocky",
     "LANGUAGE-arabic",
-    "anaconda_network_connected"
+    "anaconda_install_weak_password"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.png b/needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.png
new file mode 100644
index 00000000..204d5e13
Binary files /dev/null and b/needles/anaconda/install_process/arabic/rocky-anaconda_install_weak_password-arabic-20231116.png differ
diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.json b/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.json
new file mode 100644
index 00000000..fe09007a
--- /dev/null
+++ b/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "height": 11,
+      "width": 36,
+      "type": "match",
+      "ypos": 145,
+      "xpos": 398
+    },
+    {
+      "xpos": 43,
+      "ypos": 746,
+      "width": 393,
+      "height": 11,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_install_weak_password"
+  ]
+}
diff --git a/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.png b/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.png
new file mode 100644
index 00000000..4cdf6b6e
Binary files /dev/null and b/needles/anaconda/install_process/russian/rocky-anaconda_install_weak_password-russian-20231116.png differ
diff --git a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.png b/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.png
deleted file mode 100644
index cc67e57f..00000000
Binary files a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20210822.png and /dev/null differ
diff --git a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.json b/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.json
new file mode 100644
index 00000000..00831ed0
--- /dev/null
+++ b/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.json
@@ -0,0 +1,31 @@
+{
+  "area": [
+    {
+      "xpos": 91,
+      "ypos": 339,
+      "width": 175,
+      "height": 21,
+      "type": "match"
+    },
+    {
+      "xpos": 265,
+      "ypos": 339,
+      "width": 43,
+      "height": 35,
+      "type": "match"
+    },
+    {
+      "xpos": 91,
+      "ypos": 360,
+      "width": 53,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_network_connected"
+  ]
+}
diff --git a/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.png b/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.png
new file mode 100644
index 00000000..8884ae5f
Binary files /dev/null and b/needles/anaconda/network/arabic/rocky-anaconda_network_connected_arabic-20231117.png differ
diff --git a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.json b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.json
deleted file mode 100644
index 99222317..00000000
--- a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 133,
-      "height": 17,
-      "xpos": 568,
-      "width": 66
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-french",
-    "anaconda_network_connected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.png b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.png
deleted file mode 100644
index ad1d059d..00000000
Binary files a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20210822.png and /dev/null differ
diff --git a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.json b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.json
new file mode 100644
index 00000000..a0e83a0f
--- /dev/null
+++ b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "xpos": 737,
+      "ypos": 341,
+      "width": 125,
+      "height": 35,
+      "type": "match"
+    },
+    {
+      "xpos": 782,
+      "ypos": 379,
+      "width": 51,
+      "height": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-french",
+    "anaconda_network_connected"
+  ]
+}
diff --git a/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.png b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.png
new file mode 100644
index 00000000..c9ebccd5
Binary files /dev/null and b/needles/anaconda/network/french/rocky-anaconda_network_connected_french-20231117.png differ
diff --git a/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.png b/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.png
deleted file mode 100644
index 0349d54e..00000000
Binary files a/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.png and /dev/null differ
diff --git a/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.json b/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.json
similarity index 64%
rename from needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.json
rename to needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.json
index 10af2f69..3a766083 100644
--- a/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20210822.json
+++ b/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.json
@@ -1,17 +1,17 @@
-{
-  "area": [
-    {
-      "width": 89,
-      "height": 22,
-      "xpos": 588,
-      "ypos": 136,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-japanese",
-    "anaconda_network_connected"
-  ]
-}
\ No newline at end of file
+{
+  "area": [
+    {
+      "xpos": 737,
+      "ypos": 335,
+      "width": 71,
+      "height": 44,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-japanese",
+    "anaconda_network_connected"
+  ]
+}
diff --git a/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.png b/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.png
new file mode 100644
index 00000000..649b1ea5
Binary files /dev/null and b/needles/anaconda/network/japanese/rocky-anaconda_network_connected_japanese-20231117.png differ
diff --git a/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.png b/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.png
deleted file mode 100644
index 7073cdce..00000000
Binary files a/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.png and /dev/null differ
diff --git a/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.json b/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.json
similarity index 56%
rename from needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.json
rename to needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.json
index f1a86fae..b22de49c 100644
--- a/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20210822.json
+++ b/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.json
@@ -1,17 +1,17 @@
-{
-  "area": [
-    {
-      "xpos": 604,
-      "height": 17,
-      "width": 84,
-      "type": "match",
-      "ypos": 133
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-russian",
-    "anaconda_network_connected"
-  ]
-}
\ No newline at end of file
+{
+  "area": [
+    {
+      "xpos": 733,
+      "ypos": 340,
+      "width": 83,
+      "height": 37,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_network_connected"
+  ]
+}
diff --git a/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.png b/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.png
new file mode 100644
index 00000000..316adfde
Binary files /dev/null and b/needles/anaconda/network/russian/rocky-anaconda_network_connected_russian-20231117.png differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 3559b9ff..5af0832c 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -65,6 +65,9 @@ sub _do_root_and_user {
     # Check username (and hence keyboard layout) if non-English
     if (get_var('LANGUAGE')) {
         assert_screen "anaconda_install_user_created";
+        if (check_screen "anaconda_install_weak_password") {
+            assert_and_click "anaconda_spoke_done";
+        }
     }
 }
 
diff --git a/tests/slurm.pm b/tests/slurm.pm
index 3dfceca0..075f485a 100644
--- a/tests/slurm.pm
+++ b/tests/slurm.pm
@@ -9,17 +9,17 @@ sub slurm_setup {
     assert_script_run "dnf -y install rocky-release-hpc", 120;
 
     # Set up munge
-    assert_script_run "dnf -y install munge", 120;
+    assert_script_run 'dnf -y install munge --releasever=' . get_version_major, 120;
     assert_script_run "dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key";
     assert_script_run "chmod 400 /etc/munge/munge.key";
     assert_script_run "chown munge.munge /etc/munge/munge.key";
     assert_script_run "systemctl enable --now munge.service";
 
     # install slurm
-    if (get_var("CURRREL") eq '8') {
+    if (get_version_major() eq '8') {
         assert_script_run "dnf config-manager --set-enabled powertools";
     }
-    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd";
+    assert_script_run "dnf install -y slurm$version-slurmdbd slurm$version-slurmrestd slurm$version-slurmctld slurm$version-slurmd  --releasever=" . get_version_major;
 
     # Since this is a single node system, we don't have to modify the conf files. We will for larger multi-node tests.
     # start services