diff --git a/Dockerfile b/Dockerfile
index 29fe0a70..f24edfa5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,6 +70,12 @@ RUN cd msc-pygeoapi && \
     pip3 install -U elasticsearch && \
     # ensure cors enabled in config
     sed -i 's^# cors: true^cors: true^' $BASEDIR/msc-pygeoapi/deploy/default/msc-pygeoapi-config.yml && \
+    # GCWeb theme files
+    wget -O ./themes-gcweb.zip https://github.com/wet-boew/GCWeb/releases/download/v14.6.0/themes-dist-14.6.0-gcweb.1.zip && \
+	unzip -o ./themes-gcweb.zip "*/GCWeb/*" -d theme/static && \
+	unzip -o ./themes-gcweb.zip "*/wet-boew/*" -d theme/static && \
+	mv ./theme/static/themes-dist-14.6.0-gcweb ./theme/static/themes-gcweb && \
+	rm -f ./themes-gcweb.zip && \
     # install msc-pygeoapi
     python3 setup.py install && \
     # show version
diff --git a/debian/rules b/debian/rules
index a6c46951..4b61cd9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,10 @@ MSC_PYGEOAPI_VERSION=$(shell dpkg-parsechangelog -SVersion)
 
 	sed -i "s/MSC_PYGEOAPI_VERSION/$(MSC_PYGEOAPI_VERSION)/" theme/templates/_base.html
 
-	wget -O themes-gcweb.zip https://github.com/wet-boew/GCWeb/releases/download/v14.6.0/themes-dist-14.6.0-gcweb.1.zip 
+	wget -O ./themes-gcweb.zip https://github.com/wet-boew/GCWeb/releases/download/v14.6.0/themes-dist-14.6.0-gcweb.1.zip 
 	&& unzip -o ./themes-gcweb.zip "*/GCWeb/*" -d theme/static
 	&& unzip -o ./themes-gcweb.zip "*/wet-boew/*" -d theme/static
+	&& mv ./theme/static/themes-dist-14.6.0-gcweb ./theme/static/themes-gcweb
 	&& rm -f ./themes-gcweb.zip
 
 override_dh_auto_test:
diff --git a/theme/templates/_base.html b/theme/templates/_base.html
index 536e624d..095d40fb 100644
--- a/theme/templates/_base.html
+++ b/theme/templates/_base.html
@@ -11,7 +11,7 @@
 
     <!-- GCWeb theme -->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
-    <link rel="stylesheet" href="{{ config['server']['url'] }}/static/GCWeb/css/theme.min.css">
+    <link rel="stylesheet" href="{{ config['server']['url'] }}/static/themes-gcweb/GCWeb/css/theme.min.css">
 
     <link rel="stylesheet" href="{{ config['server']['url'] }}/static/css/default.css">
     <!--[if lt IE 9]>
@@ -175,7 +175,7 @@ <h2 class="wb-inv">{% trans %}About this site{% endtrans %}</h2>
               <a href="#wb-cont">{% trans %}Top of page{% endtrans %} <span class="glyphicon glyphicon-chevron-up"></span></a>
             </div>
             <div class="col-xs-6 col-md-3 col-lg-2 text-right">
-              <img src="{{ config['server']['url'] }}/static/GCWeb/assets/wmms-blk.svg" alt="{% trans %}Symbol of the Government of Canada{% endtrans %}" />
+              <img src="{{ config['server']['url'] }}/static/themes-gcweb/GCWeb/assets/wmms-blk.svg" alt="{% trans %}Symbol of the Government of Canada{% endtrans %}" />
             </div>
           </div>
         </div>