diff --git a/charts/dremio_v2/templates/dremio-coordinator.yaml b/charts/dremio_v2/templates/dremio-coordinator.yaml
index eeb3e0e..0099709 100644
--- a/charts/dremio_v2/templates/dremio-coordinator.yaml
+++ b/charts/dremio_v2/templates/dremio-coordinator.yaml
@@ -38,6 +38,9 @@ spec:
           requests:
             cpu: {{ $.Values.coordinator.cpu }}
             memory: {{ $.Values.coordinator.memory }}Mi
+          limits:
+            cpu: {{ $.Values.coordinator.cpu }}
+            memory: {{ $.Values.coordinator.memory }}Mi
         volumeMounts:
         - name: dremio-config
           mountPath: /opt/dremio/conf
diff --git a/charts/dremio_v2/templates/dremio-executor.yaml b/charts/dremio_v2/templates/dremio-executor.yaml
index ee44066..c019e1b 100644
--- a/charts/dremio_v2/templates/dremio-executor.yaml
+++ b/charts/dremio_v2/templates/dremio-executor.yaml
@@ -42,6 +42,9 @@ spec:
           requests:
             cpu: {{ template "dremio.executor.cpu" (list $ $engineName) }}
             memory: "{{ template "dremio.executor.memory" (list $ $engineName) }}Mi"
+          limits:
+            cpu: {{ template "dremio.executor.cpu" (list $ $engineName) }}
+            memory: "{{ template "dremio.executor.memory" (list $ $engineName) }}Mi"
         volumeMounts:
         - name: {{ template "dremio.executor.volumeClaimName" (list $ $engineName) }}
           mountPath: /opt/dremio/data
diff --git a/charts/dremio_v2/templates/dremio-master.yaml b/charts/dremio_v2/templates/dremio-master.yaml
index e25d85b..40ecbc2 100644
--- a/charts/dremio_v2/templates/dremio-master.yaml
+++ b/charts/dremio_v2/templates/dremio-master.yaml
@@ -47,6 +47,9 @@ spec:
           requests:
             cpu: {{ $.Values.coordinator.cpu }}
             memory: {{ $.Values.coordinator.memory }}Mi
+          limits:
+            cpu: {{ $.Values.coordinator.cpu }}
+            memory: {{ $.Values.coordinator.memory }}Mi
         volumeMounts:
         - name: dremio-master-volume
           mountPath: /opt/dremio/data
diff --git a/charts/dremio_v2/templates/zookeeper.yaml b/charts/dremio_v2/templates/zookeeper.yaml
index 4039792..9717127 100644
--- a/charts/dremio_v2/templates/zookeeper.yaml
+++ b/charts/dremio_v2/templates/zookeeper.yaml
@@ -60,7 +60,7 @@ spec:
       labels:
         app: zk
         {{- include "dremio.zookeeper.podLabels" $ | nindent 8 }}
-      {{- include "dremio.zookeeper.podAnnotations" $ | nindent 8 }}
+      {{- include "dremio.zookeeper.podAnnotations" $ | nindent 6 }}
     spec:
       {{- include "dremio.zookeeper.serviceAccount" $ | nindent 6 }}
       affinity:
@@ -113,6 +113,9 @@ spec:
           requests:
             cpu: {{ $.Values.zookeeper.cpu }}
             memory: {{ $.Values.zookeeper.memory }}Mi
+          limits:
+            cpu: {{ $.Values.zookeeper.cpu }}
+            memory: {{ $.Values.zookeeper.memory }}Mi
         ports:
         - containerPort: 2181
           name: client