diff --git a/src/main/k8s/dev/edp_simulator_gke.cue b/src/main/k8s/dev/edp_simulator_gke.cue
index 9110e68539..2ef8ea27e8 100644
--- a/src/main/k8s/dev/edp_simulator_gke.cue
+++ b/src/main/k8s/dev/edp_simulator_gke.cue
@@ -56,7 +56,7 @@ _edpConfigs: [
 		displayName:      "edp\(Number)"
 		publisherId:      Number
 		// Support HMSS on the first half of the EDPs so that we have one EDP with each event source supporting the protocol.
-		if (i < len(_edpResourceNames)/2) {
+		if (name == _edp1_name || name == _edp2_name || name == _edp3_name) {
 			supportHmss: true
 		}
 	},
diff --git a/src/main/k8s/local/edp_simulators.cue b/src/main/k8s/local/edp_simulators.cue
index b13fe7a4b8..fa6510ae20 100644
--- a/src/main/k8s/local/edp_simulators.cue
+++ b/src/main/k8s/local/edp_simulators.cue
@@ -62,7 +62,7 @@ _edpConfigs: [
 		displayName:      "edp\(Number)"
 		eventGroupSpec:   _eventGroupSpecs[SpecIndex]
 		// Support HMSS on the first half of the EDPs so that we have one EDP with each event source supporting the protocol.
-		if (i < len(_edpResourceNames)/2) {
+		if (name == _edp1_name || name == _edp2_name || name == _edp3_name) {
 			supportHmss: true
 		}
 	},