diff --git a/solr/Dockerfile b/solr/Dockerfile
index c573bd45..b4e0fe5f 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -44,8 +44,8 @@ RUN create-service-user.sh --name solr /data && \
 
 # Defaults environment variables to be overloaded.
 ENV \
-    SOLR_JAVA_OPTS=-Dsolr.config.lib.enabled=true \
-    SOLR_JETTY_OPTS=-Dsolr.jetty.host=0.0.0.0 \
+    SOLR_JAVA_OPTS= \
+    SOLR_JETTY_OPTS="-Dsolr.jetty.host=0.0.0.0 -Dsolr.config.lib.enabled=true" \
     SOLR_LOG_LEVEL=INFO \
     SOLR_MEMORY=512m
 
diff --git a/solr/README.md b/solr/README.md
index f40ae801..485f6975 100644
--- a/solr/README.md
+++ b/solr/README.md
@@ -21,12 +21,12 @@ additional settings, volumes, ports, etc.
 
 ## Settings
 
-| Environment Variable | Default                     | Description                                                                    |
-| :------------------- | :-------------------------- | :----------------------------------------------------------------------------- |
-| SOLR_JAVA_OPTS       |                             | Additional parameters to pass to the JVM when starting Solr                    |
-| SOLR_JETTY_OPTS      | `-Dsolr.jetty.host=0.0.0.0` | Additional parameters to pass to Jetty when starting Solr.                     |
-| SOLR_LOG_LEVEL       | `INFO`                      | Log level. Possible Values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE or ALL |
-| SOLR_MEMORY          | `512m`                      | Sets the min (-Xms) and max (-Xmx) heap size for the JVM                       |
+| Environment Variable | Default                                                    | Description                                                                    |
+| :------------------- | :--------------------------------------------------------- | :----------------------------------------------------------------------------- |
+| SOLR_JAVA_OPTS       | ``                                                         | Additional parameters to pass to the JVM when starting Solr                    |
+| SOLR_JETTY_OPTS      | `-Dsolr.jetty.host=0.0.0.0 -Dsolr.config.lib.enabled=true` | Additional parameters to pass to Jetty when starting Solr.                     |
+| SOLR_LOG_LEVEL       | `INFO`                                                     | Log level. Possible Values: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE or ALL |
+| SOLR_MEMORY          | `512m`                                                     | Sets the min (-Xms) and max (-Xmx) heap size for the JVM                       |
 
 ## Ports
 
diff --git a/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run b/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run
index 593a6534..e7f87058 100755
--- a/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run
+++ b/solr/rootfs/etc/s6-overlay/s6-rc.d/solr/run
@@ -4,7 +4,7 @@ set -e
 ARGS=(-m "${SOLR_MEMORY}")
 
 if [[ -n "${SOLR_JETTY_OPTS}" ]]; then
-  ARGS+=(-j "${SOLR_JETTY_OPTS}")
+  ARGS+=(--jvm-opts "${SOLR_JETTY_OPTS}")
 fi
 
 if [[ -n "${SOLR_JAVA_OPTS}" ]]; then