diff --git a/build.sh b/build.sh
index 526fae3f7..a5937e8ec 100755
--- a/build.sh
+++ b/build.sh
@@ -46,6 +46,6 @@ builder_run_action configure  bootstrap_configure
 builder_run_action clean      clean_docker_container $HELP_IMAGE_NAME $HELP_CONTAINER_NAME
 builder_run_action stop       stop_docker_container  $HELP_IMAGE_NAME $HELP_CONTAINER_NAME
 builder_run_action build      build_docker_container $HELP_IMAGE_NAME $HELP_CONTAINER_NAME
-builder_run_action start      start_docker_container $HELP_IMAGE_NAME $HELP_CONTAINER_NAME $HELP_CONTAINER_DESC $HOST_HELP_KEYMAN_COM $PORT_HELP_KEYMAN_COM
+builder_run_action start      start_docker_container $HELP_IMAGE_NAME $HELP_CONTAINER_NAME $HELP_CONTAINER_DESC $HOST_HELP_KEYMAN_COM $PORT_HELP_KEYMAN_COM $BUILDER_CONFIGURATION
 
 builder_run_action test       test_docker_container
diff --git a/resources/init-container.sh b/resources/init-container.sh
index c89792c47..5229ed508 100755
--- a/resources/init-container.sh
+++ b/resources/init-container.sh
@@ -5,7 +5,12 @@ rm -f keyboard/index.cache
 cd keyboard
 php -d include_path=/var/www/html/_includes:. _build_cache.php
 
-echo "---- Generating CDN ---"
-cd ../cdn
-php -d include_path=/var/www/html/_includes:. cdnrefresh.php
-cd ..
+if [[ ! $1 =~ "debug" ]]; then
+  echo "---- Generating CDN ---"
+  cd ../cdn
+  php -d include_path=/var/www/html/_includes:. cdnrefresh.php
+  cd ..
+else
+  echo "Skip Generating CDN and clean CDN cache"
+  rm -rf ../cdn/deploy
+fi