diff --git a/packages/core/platform/templates/namespaces.yaml b/packages/core/platform/templates/namespaces.yaml
index c7b174bd..11d00553 100644
--- a/packages/core/platform/templates/namespaces.yaml
+++ b/packages/core/platform/templates/namespaces.yaml
@@ -9,7 +9,7 @@
 {{- range $x := $bundle.releases }}
   {{- if not (hasKey $namespaces $x.namespace) }}
     {{- if not (has $x.name $disabledComponents) }}
-      {{- if and ($x.optional) (has $x.name $enabledComponents) }}
+      {{- if or (not $x.optional) (and ($x.optional) (has $x.name $enabledComponents)) }}
         {{- $_ := set $namespaces $x.namespace false }}
       {{- end }}
     {{- end }}