diff --git a/charts/library/common/templates/addons/netshoot/_netshoot.tpl b/charts/library/common/templates/addons/netshoot/_netshoot.tpl
index 531cfea7a1f..4a9d22d125c 100644
--- a/charts/library/common/templates/addons/netshoot/_netshoot.tpl
+++ b/charts/library/common/templates/addons/netshoot/_netshoot.tpl
@@ -3,14 +3,18 @@ Template to render code-server addon
 It will include / inject the required templates based on the given values.
 */}}
 {{- define "tc.v1.common.addon.netshoot" -}}
-{{- $targetSelector := "main" -}}
+{{- $targetSelector := list "main" -}}
 {{- if $.Values.addons.netshoot.targetSelector -}}
   {{- $targetSelector = $.Values.addons.netshoot.container.targetSelector -}}
 {{- end -}}
 {{- if .Values.addons.netshoot.enabled -}}
-  {{/* Append the code-server container to the workloads */}}
-    {{- $workload := get $.Values.workload $targetSelector -}}
-    {{- $_ := set $workload.podSpec.containers "netshoot" .Values.addons.netshoot.container -}}
+    {{- range $targetSelector -}}
+
+      {{/* Append the code-server container to the workloads */}}
+      {{- $workload := get $.Values.workload $targetSelector -}}
+      {{- $_ := set $workload.podSpec.containers "netshoot" .Values.addons.netshoot.container -}}
+    {{- end -}}
+
 
 {{- end -}}
 {{- end -}}