diff --git a/solr.sh b/solr.sh
index b78fd9c..b0ac356 100755
--- a/solr.sh
+++ b/solr.sh
@@ -8,6 +8,7 @@ docker build -t solr ${SOURCE_DIR}
 # Configure Solr
 mkdir -p /srv/solr/data
 cp ${SOURCE_DIR}/srv/solr/data/solr.xml /srv/solr/data/solr.xml
+cp ${SOURCE_DIR}/srv/solr/data/.solr.in.sh /srv/solr/data/.solr.in.sh
 chown -R 8983:8983 /srv/solr/data
 
 # Configure Solr service
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 6f934e5..130161b 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -22,4 +22,4 @@ VOLUME ["/var/lib/solr"]
 EXPOSE 8983
 
 USER solr
-CMD ["solr", "start", "-f", "-s", "/var/lib/solr"]
+CMD ["solr", "start", "-f"]
diff --git a/solr/srv/solr/data/.solr.in.sh b/solr/srv/solr/data/.solr.in.sh
new file mode 100644
index 0000000..759249c
--- /dev/null
+++ b/solr/srv/solr/data/.solr.in.sh
@@ -0,0 +1,3 @@
+SOLR_JAVA_MEM="-Xms32m -Xmx256m"
+SOLR_HOME=/var/lib/solr
+SOLR_PORT=8983