diff --git a/docker-compose.yml b/docker-compose.yml
index 0666ff4e4..978f97fee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,6 @@ services:
       image: solr:9.0.0
       environment:
         - SOLR_HOME=/mnt/ols4-solr-data
-        - SOLR_JAVA_MEM="-Xms2g -Xmx8g"
       ports:
         - 8983:8983
       volumes:
diff --git a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
index fcb6eec54..3cc4ced22 100644
--- a/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
+++ b/k8chart-dev/ols4/templates/ols4-solr-deployment.yaml
@@ -30,16 +30,18 @@ spec:
           args: ["echo Downloading data && rm -rf /data/solr && mkdir /data/solr && wget -qO- $SOLR_TARBALL_URL | tar -xz -C /data/ && echo Starting solr && solr-foreground -a -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put"]
           resources:
             requests:
-              memory: 20Gi
+              memory: 8Gi
               cpu: 2
             limits:
-              memory: 20Gi
+              memory: 8Gi
               cpu: 2
           env:
             - name: SOLR_TARBALL_URL
               value: {{.Values.solrTarballUrl}}
             - name: SOLR_HOME
               value: /data
+            - name: SOLR_JAVA_MEM
+              value: -Xms2g -Xmx4g
           ports:
             - containerPort: 8983