diff --git a/charts/deepgram-self-hosted/CHANGELOG.md b/charts/deepgram-self-hosted/CHANGELOG.md
index a929f07..5e72a83 100644
--- a/charts/deepgram-self-hosted/CHANGELOG.md
+++ b/charts/deepgram-self-hosted/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - Added `externalTrafficPolicy` configuration for LoadBalancer services to control traffic routing behavior
 - Updated sample configurations to demonstrate service configuration options including LoadBalancer security settings
 - Container-level security context support to Helm templates
+- Supported removing resource limits on Engine pods
 
 ### Changed
 
diff --git a/charts/deepgram-self-hosted/templates/engine/engine.deployment.yaml b/charts/deepgram-self-hosted/templates/engine/engine.deployment.yaml
index b728134..5da15bb 100644
--- a/charts/deepgram-self-hosted/templates/engine/engine.deployment.yaml
+++ b/charts/deepgram-self-hosted/templates/engine/engine.deployment.yaml
@@ -119,8 +119,12 @@ spec:
             nvidia.com/gpu: {{ $.Values.engine.resources.requests.gpu }}
             {{- end }}
           limits:
+            {{- if $.Values.engine.resources.limits.memory }}
             memory: "{{ $.Values.engine.resources.limits.memory }}"
+            {{- end }}
+            {{- if $.Values.engine.resources.limits.cpu }}
             cpu: "{{ $.Values.engine.resources.limits.cpu }}"
+            {{- end }}
             {{- if gt (int $.Values.engine.resources.limits.gpu) 0 }}
             nvidia.com/gpu: {{ $.Values.engine.resources.limits.gpu }}
             {{- end }}