diff --git a/Dockerfile b/Dockerfile
index f9f9d90..aaac78d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,8 @@ ENV PATH=$GLOBUS_LOCATION/bin:$PATH
 #ENV EXIST_HOME=
 #ENV GLOBUS_OPTIONS="-Dexist.home=$EXIST_HOME"
 ENV GLOBUS_OPTIONS=""
+ENV USER=$LOGNAME
+ENV GCORE_START_OPTIONS="-DX509_USER_PROXY=$X509_USER_PROXY -Xms2800M -Xmx4800M"
 
 RUN adduser --system --gecos "Gcube service user" --disabled-password --disabled-login --uid 333 --shell /usr/sbin/nologin gcube 
 RUN apt-get update
@@ -23,6 +25,7 @@ WORKDIR /home/gcube
 RUN cd /home/gcube && wget https://nexus.d4science.org/nexus/content/repositories/gcube-staging-gcore/org/gcube/distribution/ghn-distribution/7.0.1-4.16.0-144317/ghn-distribution-7.0.1-4.16.0-144317.tar.gz && tar zxf ghn-distribution-7.0.1-4.16.0-144317.tar.gz && rm -f ghn-distribution-7.0.1-4.16.0-144317.tar.gz && mkdir -p /home/gcube/gCore/logs /home/gcube/gCore/tmp /home/gcube/gCore/config /home/gcube/gCore/etc && chown gcube /home/gcube/gCore/logs /home/gcube/gCore/tmp /home/gcube/gCore/config /home/gcube/gCore/etc
 COPY src/gcube-start-container.sh /home/gcube/gCore/bin/gcore-start-container
 COPY src/GHNConfig.xml /home/gcube/gCore/config/GHNConfig.xml
+RUN $GLOBUS_LOCATION/bin/gcore-load-env
 RUN chmod 755 /home/gcube/gCore/bin/gcore-start-container
 # Remove Resultset from distribution
 RUN /home/gcube/gCore/bin/gcore-undeploy-service org.gcube.common.searchservice.resultsetservice