diff --git a/docker-init.sh b/docker-init.sh
index 3347fee546..1c96a58627 100755
--- a/docker-init.sh
+++ b/docker-init.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 echo "prepare environment"
 # replace BASE_URL constant by REMARK_URL
-sed -i "s|https://demo.remark42.com|${REMARK_URL}|g" /srv/web/*.js
+sed -i "s|https://demo.remark42.com|${REMARK_URL}|g" /srv/web/*.{js,html}
+
+if [ -n "${SITE_ID}" ]; then
+  #replace "site_id: 'remark'" by SITE_ID
+  se -i "s|'remark'|'${SITE_ID}'|g" /srv/web/*.html
+fi
 
 if [ -d "/srv/var" ]; then
   chown -R app:app /srv/var 2>/dev/null
diff --git a/frontend/comments.ejs b/frontend/comments.ejs
index caba10fcb3..50af6a979a 100644
--- a/frontend/comments.ejs
+++ b/frontend/comments.ejs
@@ -68,7 +68,7 @@
 
         var remark_config = {
           site_id: query.site_id,
-          host: window.location.origin,
+          host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
           url: query.url
         };
 
diff --git a/frontend/counter.ejs b/frontend/counter.ejs
index b0f6392008..70234b839a 100644
--- a/frontend/counter.ejs
+++ b/frontend/counter.ejs
@@ -39,7 +39,7 @@
   <script>
     var remark_config = {
       site_id: 'remark',
-      host: window.location.origin,
+      host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
       url: 'https://remark42.com/demo/',
       components: ['counter']
     };
diff --git a/frontend/index.ejs b/frontend/index.ejs
index 0ceb2e06f4..03cfbdbee1 100644
--- a/frontend/index.ejs
+++ b/frontend/index.ejs
@@ -123,7 +123,7 @@
 
       var remark_config = {
         site_id: 'remark',
-        host: window.location.origin,
+        host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
         url: 'https://remark42.com/demo/',
         components: ['embed', 'counter'],
         // __colors__: {
diff --git a/frontend/last-comments.ejs b/frontend/last-comments.ejs
index 061f0c6ffd..ef2a20a167 100644
--- a/frontend/last-comments.ejs
+++ b/frontend/last-comments.ejs
@@ -25,7 +25,7 @@
     <script>
       var remark_config = {
         site_id: 'remark',
-        host: window.location.origin,
+        host: '<%= htmlWebpackPlugin.options.remarkUrl %>',
         components: ['last-comments']
       };
 
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index 6f4d92f0fb..fa418a8eb0 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -180,21 +180,25 @@ module.exports = () => ({
     new Html({
       template: path.resolve(__dirname, 'index.ejs'),
       inject: false,
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'counter.ejs'),
       filename: 'counter.html',
       inject: false,
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'last-comments.ejs'),
       filename: 'last-comments.html',
       inject: false,
+      remarkUrl,
     }),
     new Html({
       template: path.resolve(__dirname, 'comments.ejs'),
       filename: 'comments.html',
       inject: false,
+      remarkUrl,
     }),
     new MiniCssExtractPlugin({
       filename: '[name].css',