diff --git a/Dockerfile b/Dockerfile
index 18d3b6fd1c957485a4714e8ecb51d7ec5f514149..68e2bceb513f845599cd672fe044220b9e9157f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ RUN mkdir /opt/toolbox
 COPY toolbox/ /opt/toolbox/
 
 # unzip toolbox
+RUN apk add patch curl bash jq
 RUN cd /opt/toolbox && unzip -o cdh-toolbox-${VERSION}.zip && patch -p0 < solr-config.patch
 
 CMD /opt/toolbox/init.sh
diff --git a/init-solr.yaml b/init-solr.yaml
index 44e9a57ce8a7448c59db62d1008791ce7df8069f..be03e8a7c118ecb68c5e35222498bb2cc65d1a4c 100644
--- a/init-solr.yaml
+++ b/init-solr.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - image: gitlab-registry.cesnet.cz/702/provoz/gss/init-solr:1.4.3-cesnet0
+      - image: gitlab-registry.cesnet.cz/702/provoz/gss/init-solr:1.4.3-cesnet1
         name: init-solr
         envFrom:
         - secretRef:
diff --git a/toolbox/init.sh b/toolbox/init.sh
index 4cb4b6cbdc11e789368296b14b43d7a756de2b89..12ce30568a64377303eead0942b1b8d782c236c3 100755
--- a/toolbox/init.sh
+++ b/toolbox/init.sh
@@ -8,7 +8,8 @@ export SOLR_PASSWORD="${SOLR_PASSWORD}"
 # Create solr collection
 cd /opt/toolbox/solr
 echo "Creating Solr collection..."
-curl "http://$SOLR_HOST:8983/solr/admin/collections?action=CREATE&name=${SOLR_CORE}&numShards=1&replicationFactor=3&collection.configName=_default"
+[ -n "$SOLR_USER" -a -n "$SOLR_PASSWORD" ] && CURL_OPTS="-u $SOLR_USER:$SOLR_PASSWORD"
+curl $CURL_OPTS "$SOLR_URL/admin/collections?action=CREATE&name=${SOLR_CORE}&numShards=1&replicationFactor=3&collection.configName=_default"
 echo "Solr collection ${SOLR_CORE} created."
 
 # Update solr schema