diff --git a/charts/capi-runtime-extensions/templates/deployment.yaml b/charts/capi-runtime-extensions/templates/deployment.yaml
index d6e9d6c73..72fa8fe36 100644
--- a/charts/capi-runtime-extensions/templates/deployment.yaml
+++ b/charts/capi-runtime-extensions/templates/deployment.yaml
@@ -37,6 +37,8 @@ spec:
         - --nfd.crs.defaults-namespace={{ .Release.Namespace }}
         - --nfd.helm-addon.defaults-namespace={{ .Release.Namespace }}
         - --nfd.helm-addon.default-values-template-configmap-name={{ .Values.hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
+        - --awscpi.defaults-namespace={{ .Release.Namespace }}
+        - --awsebs.defaults-namespace={{ .Release.Namespace }}
         {{- range $key, $value := .Values.extraArgs }}
         - --{{ $key }}={{ $value }}
         {{- end }}