diff --git a/charts/templates/metastore/deployment.yaml b/charts/templates/metastore/deployment.yaml
index b24f620..8d7f815 100644
--- a/charts/templates/metastore/deployment.yaml
+++ b/charts/templates/metastore/deployment.yaml
@@ -60,9 +60,9 @@ spec:
         - name: HADOOP_OPTS
           value: >
             -server
-            -Xmx{{ .Values.presto.jvm.maxHeapSize }}
-            -XX:+{{ .Values.presto.jvm.gcMethod.type }}
-            -XX:G1HeapRegionSize={{ .Values.presto.jvm.gcMethod.g1.heapRegionSize }}
+            -Xmx{{ .Values.metastore.jvm.maxHeapSize }}
+            -XX:+{{ .Values.metastore.jvm.gcMethod.type }}
+            -XX:G1HeapRegionSize={{ .Values.metastore.jvm.gcMethod.g1.heapRegionSize }}
             -XX:+UseGCOverheadLimit
             -XX:+ExplicitGCInvokesConcurrent
             -XX:+HeapDumpOnOutOfMemoryError
diff --git a/charts/values.yaml b/charts/values.yaml
index d84f0d1..48d5e3d 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -40,6 +40,12 @@ presto:
       alb.ingress.kubernetes.io/healthcheck-path: /v1/cluster
 
 metastore:
+  jvm:
+    maxHeapSize: 768M
+    gcMethod:
+      type: UseG1GC
+      g1:
+        heapRegionSize: 32M
   allowDropTable: false
   service:
     type: ClusterIP
diff --git a/images/metastore/Dockerfile b/images/metastore/Dockerfile
index 89521fa..f8c8852 100644
--- a/images/metastore/Dockerfile
+++ b/images/metastore/Dockerfile
@@ -12,8 +12,7 @@ ARG jmx_exporter_bin="https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prome
 
 
 ENV METASTORE_HOME=/opt/hive-metastore \
-    HADOOP_HOME=/opt/hadoop \
-    HADOOP_OPTS="-Xms768m -Xmx768m -XX:NewSize=300m"
+    HADOOP_HOME=/opt/hadoop
 RUN set -ex && \
     apk add --no-cache bash tini libc6-compat linux-pam && \
     mkdir -p /opt && \