diff --git a/Dockerfile b/Dockerfile
index b9fac98..a165c8c 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 $JENKINS_HOME/userContent
+COPY theme /usr/share/jenkins/ref/userContent
 
 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 34e5c46..2cd468b 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -7,7 +7,7 @@
 
 JENKINSTHEME_CSS_URL=${JENKINSTHEME_CSS_URL:-/userContent/theme/mirantis.css}
 JENKINSTHEME_JS_URL=${JENKINSTHEME_JS_URL:-/userContent/theme/mirantis.css}
-cat /tmp/org.codefirst.SimpleThemeDecorator.xml | envsubst > $JENKINS_HOME/org.codefirst.SimpleThemeDecorator.xml
+[ -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
 import jenkins.model.*