diff --git a/mininet/templates/deployment.yaml b/mininet/templates/deployment.yaml
index 90d54b2..ba653b7 100644
--- a/mininet/templates/deployment.yaml
+++ b/mininet/templates/deployment.yaml
@@ -40,7 +40,7 @@
         - name: {{ .Chart.Name }}
           image: "{{ .Values.global.registry }}{{ .Values.images.mininet.repository }}:{{ tpl .Values.images.mininet.tag . }}"
           imagePullPolicy: {{ .Values.images.mininet.pullPolicy }}
-{{- if $.Values.stratumEnabled }}
+{{- if gt ($.Values.mnStratumSwitchCount|int) 0 }}
           command: ["python"]
 {{- end }}
           args: [{{ .Values.topoScript }}]
diff --git a/mininet/templates/mn-stratum-service.yaml b/mininet/templates/mn-stratum-service.yaml
index 0cf7d86..55fe517 100644
--- a/mininet/templates/mn-stratum-service.yaml
+++ b/mininet/templates/mn-stratum-service.yaml
@@ -16,7 +16,7 @@
 # Service that exposes the gRPC port to control the stratum_bmv2 instance(s)
 # running inside Mininet
 
-{{- if $.Values.stratumEnabled }}
+{{- if gt (.Values.mnStratumSwitchCount|int) 0 }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -30,8 +30,10 @@
 spec:
   type: ClusterIP
   ports:
-  - name: stratum-1
-    port: 50001
+  {{- range $j, $junk := until (.Values.mnStratumSwitchCount|int) }}
+  - name: stratum-{{ add $j 1 }}
+    port: {{ add $j 50001 }}
+  {{- end}}
   selector:
     app: {{ template "mininet.name" . }}
     release: {{ .Release.Name }}