diff --git a/charts/temporal/templates/server-deployment.yaml b/charts/temporal/templates/server-deployment.yaml
index be4d43cb..73011992 100644
--- a/charts/temporal/templates/server-deployment.yaml
+++ b/charts/temporal/templates/server-deployment.yaml
@@ -4,7 +4,7 @@
 {{- $secondaryVisibilityStore := include "temporal.persistence.getStoreByType" (list $ "secondaryVisibility") | fromYaml -}}
 {{- range $service := (list "frontend" "internal-frontend" "history" "matching" "worker") }}
 {{- $serviceValues := index $.Values.server $service }}
-{{- if or (not (hasKey $serviceValues "enabled")) $serviceValues.enabled }}
+{{- if $serviceValues.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/charts/temporal/templates/server-service.yaml b/charts/temporal/templates/server-service.yaml
index 154d07d1..06969f0e 100644
--- a/charts/temporal/templates/server-service.yaml
+++ b/charts/temporal/templates/server-service.yaml
@@ -1,7 +1,7 @@
 {{- if $.Values.server.enabled }}
 {{- range $service := (list "frontend" "internal-frontend") }}
 {{- $serviceValues := index $.Values.server $service }}
-{{- if or (not (hasKey $serviceValues "enabled")) $serviceValues.enabled }}
+{{- if $serviceValues.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml
index d8fb7bba..bd51c22c 100644
--- a/charts/temporal/values.yaml
+++ b/charts/temporal/values.yaml
@@ -248,6 +248,7 @@ server:
         - name: default
           retention: 3d
   frontend:
+    enabled: true
     service:
       # Evaluated as template
       annotations: {}
@@ -337,6 +338,7 @@ server:
     topologySpreadConstraints: []
     podDisruptionBudget: {}
   history:
+    enabled: true
     service:
       # type: ClusterIP
       port: 7234
@@ -366,6 +368,7 @@ server:
     topologySpreadConstraints: []
     podDisruptionBudget: {}
   matching:
+    enabled: true
     service:
       # type: ClusterIP
       port: 7235
@@ -395,6 +398,7 @@ server:
     topologySpreadConstraints: []
     podDisruptionBudget: {}
   worker:
+    enabled: true
     service:
       # type: ClusterIP
       port: 7239