diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b89d6e92f2daf3caf7c8ed706287a7bf80cf6e57..2dee37940c628fdf7cc7d77d986971879035b407 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ variables:
 .compute_version: &compute_version
   - if [ "$CHANNEL" == "stable" ]; then export FILTER="grep -v beta"; else export FILTER="grep beta"; fi
   - export DISCOURSE_VERSION=`wget -qO- https://api.github.com/repos/discourse/discourse/tags | grep name | cut -d'"' -f4 | $FILTER | head -n1`
+  -  export DATE=`date "+%Y-%m-%dT%H-%M-%SZ"`
 
 .test:
   image:
diff --git a/Dockerfile b/Dockerfile
index 2f7e62990e107e3e4e3646c872438fc1ff16e4d2..1a95c3013438cd01313790cf53b30782e322a3ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ FROM $from:$tag
 
 ENV RAILS_ENV=production \
     DISCOURSE_SERVE_STATIC_ASSETS=true \
+    EMBER_CLI_COMPILE_DONE=1 \
     EMBER_CLI_PROD_ASSETS=1 \
     RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 \
     RUBY_GC_HEAP_GROWTH_MAX_SLOTS=40000 \
@@ -40,4 +41,7 @@ RUN cd /var/www/discourse/plugins \
       git clone $plugin; \
     done
 
+RUN  cd app/assets/javascripts/discourse && \
+     /var/www/discourse/app/assets/javascripts/node_modules/.bin/ember build -prod
+
 CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]