diff --git a/maintnotifications/e2e/scenario_endpoint_types_test.go b/maintnotifications/e2e/scenario_endpoint_types_test.go
index 94a99f55..e6a31b20 100644
--- a/maintnotifications/e2e/scenario_endpoint_types_test.go
+++ b/maintnotifications/e2e/scenario_endpoint_types_test.go
@@ -61,7 +61,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("standalone")
+	factory, err := CreateTestClientFactory("m-standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping endpoint types test: %v", err)
 	}
diff --git a/maintnotifications/e2e/scenario_push_notifications_test.go b/maintnotifications/e2e/scenario_push_notifications_test.go
index 74d0a894..0f8be88b 100644
--- a/maintnotifications/e2e/scenario_push_notifications_test.go
+++ b/maintnotifications/e2e/scenario_push_notifications_test.go
@@ -59,7 +59,7 @@ func TestPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("standalone")
+	factory, err := CreateTestClientFactory("m-standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping push notification tests: %v", err)
 	}
diff --git a/maintnotifications/e2e/scenario_stress_test.go b/maintnotifications/e2e/scenario_stress_test.go
index 5a788ef1..66fd1e37 100644
--- a/maintnotifications/e2e/scenario_stress_test.go
+++ b/maintnotifications/e2e/scenario_stress_test.go
@@ -49,7 +49,7 @@ func TestStressPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("standalone")
+	factory, err := CreateTestClientFactory("m-standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping stress test: %v", err)
 	}
diff --git a/maintnotifications/e2e/scenario_timeout_configs_test.go b/maintnotifications/e2e/scenario_timeout_configs_test.go
index 0477a53f..054e967e 100644
--- a/maintnotifications/e2e/scenario_timeout_configs_test.go
+++ b/maintnotifications/e2e/scenario_timeout_configs_test.go
@@ -77,7 +77,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("standalone")
+	factory, err := CreateTestClientFactory("m-standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping timeout configs test: %v", err)
 	}
diff --git a/maintnotifications/e2e/scenario_tls_configs_test.go b/maintnotifications/e2e/scenario_tls_configs_test.go
index cbaec43a..a6d8735c 100644
--- a/maintnotifications/e2e/scenario_tls_configs_test.go
+++ b/maintnotifications/e2e/scenario_tls_configs_test.go
@@ -74,7 +74,7 @@ func TestTLSConfigurationsPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("standalone")
+	factory, err := CreateTestClientFactory("m-standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping TLS configs test: %v", err)
 	}
diff --git a/maintnotifications/e2e/scripts/run-e2e-tests.sh b/maintnotifications/e2e/scripts/run-e2e-tests.sh
index f1175523..9426fbdd 100755
--- a/maintnotifications/e2e/scripts/run-e2e-tests.sh
+++ b/maintnotifications/e2e/scripts/run-e2e-tests.sh
@@ -3,7 +3,7 @@
 # Maintenance Notifications E2E Tests Runner
 # This script sets up the environment and runs the maintnotifications upgrade E2E tests
 
-set -eu
+set -euo pipefail
 
 # Script directory and repository root
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"