diff --git a/testsuite/forge.py b/testsuite/forge.py
index 2a2e144e32f97..ccbc10e146eb6 100644
--- a/testsuite/forge.py
+++ b/testsuite/forge.py
@@ -988,8 +988,14 @@ def image_exists(
 
 def sanitize_forge_resource_name(forge_resource: str, max_length: int = 63) -> str:
     """
-    Sanitize the intended forge resource name to be a valid k8s resource name
+    Sanitize the intended forge resource name to be a valid k8s resource name.
+    Resource names must be: (i) 63 characters or less; (ii) contain characters
+    that are alphanumeric, '-', or '.'; (iii) start and end with an alphanumeric
+    character; and (iv) start with "forge-".
     """
+    if not forge_resource.startswith("forge-"):
+        raise Exception("Forge resource name must start with 'forge-'")
+
     sanitized_namespace = ""
     for i, c in enumerate(forge_resource):
         if i >= max_length:
@@ -997,9 +1003,13 @@ def sanitize_forge_resource_name(forge_resource: str, max_length: int = 63) -> s
         if c.isalnum():
             sanitized_namespace += c
         else:
-            sanitized_namespace += "-"
-    if not forge_resource.startswith("forge-"):
-        raise Exception("Forge resource name must start with 'forge-'")
+            sanitized_namespace += "-"  # Replace the invalid character with a '-'
+
+    if sanitized_namespace.endswith("-"):
+        sanitized_namespace = (
+            sanitized_namespace[:-1] + "0"
+        )  # Set the last character to '0'
+
     return sanitized_namespace
 
 
diff --git a/testsuite/forge_test.py b/testsuite/forge_test.py
index 0b62afe80e6d6..494510d7cc37d 100644
--- a/testsuite/forge_test.py
+++ b/testsuite/forge_test.py
@@ -623,11 +623,22 @@ def testFormatReport(self) -> None:
             "testFormatReport.fixture",
         )
 
+    def testSanitizeForgeNamespaceLastCharacter(self) -> None:
+        namespace_with_invalid_last_char = "forge-$$$"
+        namespace = sanitize_forge_resource_name(namespace_with_invalid_last_char)
+        self.assertEqual(namespace, "forge---0")
+
     def testSanitizeForgeNamespaceSlashes(self) -> None:
         namespace_with_slash = "forge-banana/apple"
         namespace = sanitize_forge_resource_name(namespace_with_slash)
         self.assertEqual(namespace, "forge-banana-apple")
 
+    def testSanitizeForgeNamespaceStartsWith(self) -> None:
+        namespace_with_invalid_start = "frog-"
+        self.assertRaises(
+            Exception, sanitize_forge_resource_name, namespace_with_invalid_start
+        )
+
     def testSanitizeForgeNamespaceTooLong(self) -> None:
         namespace_too_long = "forge-" + "a" * 10000
         namespace = sanitize_forge_resource_name(namespace_too_long)