diff --git a/container-start.sh b/container-start.sh
index 2aa4ae10f..990a83cd2 100755
--- a/container-start.sh
+++ b/container-start.sh
@@ -9,15 +9,20 @@ mkdir -p customize
 # Linking config.js
 [ ! -h config.js ] && echo "Linking config.js" && ln -s customize/config.js config.js
 
+# Thanks to http://stackoverflow.com/a/10467453
+sedeasy() {
+  sed -i "s/$1/$(echo $2 | sed -e 's/[\/&]/\\&/g')/g" $3
+}
+
 # Configure
 [ -n "$USE_SSL" ] && echo "Using secure websockets: $USE_SSL" \
-  && sed -i "s/useSecureWebsockets: .*/useSecureWebsockets: ${USE_SSL},/g" customize/config.js
+  && sedeasy "useSecureWebsockets: [^,]*," "useSecureWebsockets: ${USE_SSL}," customize/config.js
 
 [ -n "$STORAGE" ] && echo "Using storage adapter: $STORAGE" \
-  && sed -i "s/storage: .*/storage: ${STORAGE},/g" customize/config.js
+  && sedeasy "storage: [^,]*," "storage: ${STORAGE}," customize/config.js
 
 [ -n "$LOG_TO_STDOUT" ] && echo "Logging to stdout: $LOG_TO_STDOUT" \
-  && sed -i "s/logToStdout: .*/logToStdout: ${LOG_TO_STDOUT},/g" customize/config.js
+  && sedeasy "logToStdout: [^,]*," "logToStdout: ${LOG_TO_STDOUT}," customize/config.js
 
 
 exec node ./server.js
diff --git a/docs/cryptpad-docker.md b/docs/cryptpad-docker.md
index d329f0354..027792c2e 100644
--- a/docs/cryptpad-docker.md
+++ b/docs/cryptpad-docker.md
@@ -22,15 +22,6 @@ Or, using docker-compose
 docker-compose up -d
 ```
 
-## TODO
-
-```
-cryptpad_1  | Linking config.js
-cryptpad_1  | Using secure websockets: true
-cryptpad_1  | Using storage adapter: './storage/file'
-cryptpad_1  | sed: -e expression #1, char 27: unknown option to `s'
-```
-
 ## Configuration
 
 Set configurations Dockerfile or in .env (using docker-compose) file.