diff --git a/Dockerfile b/Dockerfile
index a165c8c..1480bf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,7 +72,7 @@
 # from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
 COPY plugins.sh /usr/local/bin/plugins.sh
 COPY install-plugins.sh /usr/local/bin/install-plugins.sh
-COPY theme /usr/share/jenkins/ref/userContent
+COPY theme /usr/share/jenkins/ref/userContent/theme
 
 RUN JENKINS_UC_DOWNLOAD=http://archives.jenkins-ci.org /usr/local/bin/install-plugins.sh \
         ansicolor \
diff --git a/jenkins.sh b/jenkins.sh
index 2cd468b..7580526 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -5,8 +5,8 @@
 echo "--- Copying files at $(date)" >> "$COPY_REFERENCE_FILE_LOG"
 find /usr/share/jenkins/ref/ -type f -exec bash -c '. /usr/local/bin/jenkins-support; for arg; do copy_reference_file "$arg"; done' _ {} +
 
-JENKINSTHEME_CSS_URL=${JENKINSTHEME_CSS_URL:-/userContent/theme/mirantis.css}
-JENKINSTHEME_JS_URL=${JENKINSTHEME_JS_URL:-/userContent/theme/mirantis.css}
+export JENKINSTHEME_CSS_URL=${JENKINSTHEME_CSS_URL:-/userContent/theme/mirantis.css}
+export JENKINSTHEME_JS_URL=${JENKINSTHEME_JS_URL:-/userContent/theme/mirantis.css}
 [ -f $JENKINS_HOME/org.codefirst.SimpleThemeDecorator.xml ] || cat /tmp/org.codefirst.SimpleThemeDecorator.xml | envsubst > $JENKINS_HOME/org.codefirst.SimpleThemeDecorator.xml
 
 cat << EOF >>/usr/share/jenkins/ref/init.groovy.d/executors.groovy