diff --git a/charts/cdefense/templates/graphql/service.yaml b/charts/cdefense/templates/graphql/service.yaml
index 7f06db6..2dcfcda 100644
--- a/charts/cdefense/templates/graphql/service.yaml
+++ b/charts/cdefense/templates/graphql/service.yaml
@@ -1,3 +1,5 @@
+{{ if .Values.graphql.enabled }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,3 +12,5 @@ spec:
     app: graphql
   ports:
 	{{- .Values.graphql.service.ports | toYaml | nindent 2 -}}
+---
+{{ end }}
\ No newline at end of file
diff --git a/charts/cdefense/templates/ingress.yaml b/charts/cdefense/templates/ingress.yaml
index 3cee50c..0bedfcd 100644
--- a/charts/cdefense/templates/ingress.yaml
+++ b/charts/cdefense/templates/ingress.yaml
@@ -145,6 +145,7 @@ spec:
             name: uptime
             port:
               number: 80
+  {{ if .Values.recommendation.enabled }}
   - host: {{ if .Values.recommendation.hostname }}"{{ .Values.recommendation.hostname }}"{{- else }}"recommendation.{{ .Values.domain }}"{{- end }}
     http:
       paths:
@@ -155,6 +156,7 @@ spec:
             name: recommendation
             port:
               number: 80
+  {{ end }}
 ---
 {{ if .Values.graphql.enabled }}
 ---
diff --git a/charts/cdefense/templates/recommendation/deployment.yaml b/charts/cdefense/templates/recommendation/deployment.yaml
index f499905..24a0517 100644
--- a/charts/cdefense/templates/recommendation/deployment.yaml
+++ b/charts/cdefense/templates/recommendation/deployment.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.recommendation.enabled }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -85,3 +86,5 @@ spec:
           resources: {}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
+---
+{{ end }}
\ No newline at end of file
diff --git a/charts/cdefense/templates/recommendation/service.yaml b/charts/cdefense/templates/recommendation/service.yaml
index bb07948..fbcd364 100644
--- a/charts/cdefense/templates/recommendation/service.yaml
+++ b/charts/cdefense/templates/recommendation/service.yaml
@@ -1,3 +1,5 @@
+{{ if .Values.recommendation.enabled }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -9,4 +11,6 @@ spec:
   selector:
     app: recommendation
   ports:
-    {{ .Values.recommendation.service.ports | toYaml | nindent 2 }}
\ No newline at end of file
+    {{ .Values.recommendation.service.ports | toYaml | nindent 2 }}
+---
+{{ end }}
\ No newline at end of file
diff --git a/charts/cdefense/values.yaml b/charts/cdefense/values.yaml
index 20f9ee1..56e840d 100644
--- a/charts/cdefense/values.yaml
+++ b/charts/cdefense/values.yaml
@@ -14,8 +14,8 @@ ingress:
   alb:
     scheme: internet-facing
   nginx:
-    class: nginx-external
-    certificate: letsencrypt-dev
+    class: ""
+    certificate: ""
 
 aws:
   certificatearn: ""
@@ -175,6 +175,7 @@ alertservice:
     targetMemoryUtilizationPercentage: 80
 
 recommendation:
+  enabled: true
   nodeSelector: cdefense
   tolerations: []
   replicas: 1