diff --git a/examples/redmine/docker-compose.yml b/examples/redmine/docker-compose.yml
index baa08ce2..f83d2992 100644
--- a/examples/redmine/docker-compose.yml
+++ b/examples/redmine/docker-compose.yml
@@ -51,9 +51,9 @@ services:
       - redmine-data:/usr/src/redmine/files
     environment:
       - REDMINE_DB_MYSQL=mydb
-      - REDMINE_DB_DATABASE=${REDMINE_DATABASE:-redminedb}
-      - REDMINE_DB_USERNAME=${REDMINE_USER:-user}
-      - REDMINE_DB_PASSWORD=${REDMINE_PASSWORD:-secret} # set a stronger password in a .env file (must match MYSQL_PASSWORD)
+      - REDMINE_DB_DATABASE=redminedb
+      - REDMINE_DB_USERNAME=user
+      - REDMINE_DB_PASSWORD=db-user-pwd # set a stronger password in a .env file (must match MYSQL_PASSWORD)
     networks:
       - bw-services
 
diff --git a/misc/integrations/autoconf.mariadb.ui.yml b/misc/integrations/autoconf.mariadb.ui.yml
index 55108bde..9ff1d172 100644
--- a/misc/integrations/autoconf.mariadb.ui.yml
+++ b/misc/integrations/autoconf.mariadb.ui.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.mariadb.yml b/misc/integrations/autoconf.mariadb.yml
index a8fcbb22..c85e08fd 100644
--- a/misc/integrations/autoconf.mariadb.yml
+++ b/misc/integrations/autoconf.mariadb.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.mysql.ui.yml b/misc/integrations/autoconf.mysql.ui.yml
index 08a84260..1478dc5a 100644
--- a/misc/integrations/autoconf.mysql.ui.yml
+++ b/misc/integrations/autoconf.mysql.ui.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.mysql.yml b/misc/integrations/autoconf.mysql.yml
index d55b1563..3e66f69e 100644
--- a/misc/integrations/autoconf.mysql.yml
+++ b/misc/integrations/autoconf.mysql.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.postgres.ui.yml b/misc/integrations/autoconf.postgres.ui.yml
index dc4853db..53b3c9ed 100644
--- a/misc/integrations/autoconf.postgres.ui.yml
+++ b/misc/integrations/autoconf.postgres.ui.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.postgres.yml b/misc/integrations/autoconf.postgres.yml
index d0ae4203..6924217b 100644
--- a/misc/integrations/autoconf.postgres.yml
+++ b/misc/integrations/autoconf.postgres.yml
@@ -27,7 +27,6 @@ services:
       - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.ui.yml b/misc/integrations/autoconf.ui.yml
index 5957fb62..60812936 100644
--- a/misc/integrations/autoconf.ui.yml
+++ b/misc/integrations/autoconf.ui.yml
@@ -27,7 +27,6 @@ services:
     environment:
       - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
-      - AUTOCONF_MODE=yes
     networks:
       - bw-universe
       - bw-docker
diff --git a/misc/integrations/autoconf.yml b/misc/integrations/autoconf.yml
index 650e5538..46cd8ac7 100644
--- a/misc/integrations/autoconf.yml
+++ b/misc/integrations/autoconf.yml
@@ -39,7 +39,6 @@ services:
     volumes:
       - bw-data:/data
     environment:
-      - AUTOCONF_MODE=yes
       - DOCKER_HOST=tcp://bw-docker:2375
       - AUTOCONF_MODE=yes
     networks:
diff --git a/src/linux/scripts/start.sh b/src/linux/scripts/start.sh
index 2d65f557..1920d9ca 100644
--- a/src/linux/scripts/start.sh
+++ b/src/linux/scripts/start.sh
@@ -35,7 +35,7 @@ function start() {
 
     # Create dummy variables.env
     if [ ! -f /etc/bunkerweb/variables.env ]; then
-        echo -ne "\# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n" > /etc/bunkerweb/variables.env
+        echo -ne "# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n" > /etc/bunkerweb/variables.env
     fi
 
     # Update database
diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh
index 92557753..ea2a40a8 100755
--- a/tests/ui/tests.sh
+++ b/tests/ui/tests.sh
@@ -9,7 +9,7 @@ sed -i "s@bunkerity/bunkerweb-scheduler:.*@scheduler-tests@" docker-compose.yml
 sed -i "s@bunkerity/bunkerweb-ui:.*@ui-tests@" docker-compose.yml
 
 # Start stack
-docker-compose pull docker-proxy app1
+docker-compose pull bw-docker-proxy app1
 if [ $? -ne 0 ] ; then
     echo "❌ Pull failed"
     exit 1
@@ -21,7 +21,7 @@ if [ $? -ne 0 ] ; then
 fi
 i=0
 while [ $i -lt 120 ] ; do
-    containers=("ui-bw-1" "ui-bw-scheduler-1" "ui-bw-ui-1" "ui-docker-proxy-1" "ui-app1-1")
+    containers=("ui-bw-1" "ui-bw-scheduler-1" "ui-bw-ui-1" "ui-bw-docker-proxy-1" "ui-app1-1")
     healthy="true"
     for container in "${containers[@]}" ; do
         check="$(docker inspect --format "{{json .State.Health }}" $container | grep "healthy")"