diff --git a/.travis.yml b/.travis.yml
index b44e89f..8c4f119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,11 @@ env:
 
   # custom values
   - config: postgres.yml
-    EXT_DB_NAME: mydb
-    EXT_DB_USER: myuser
-    EXT_DB_PWD: password
-    EXT_POSTGRES_DB: mydb
-    EXT_POSTGRES_USER: myuser
+    DB_NAME: mydb
+    DB_USER: myuser
+    DB_PWD: password
+    POSTGRES_DB: mydb
+    POSTGRES_USER: myuser
 
   # deprecated variables
   - config: postgres-old.yml
diff --git a/tests/activemq.yml b/tests/activemq.yml
index f624a45..6c3aad7 100644
--- a/tests/activemq.yml
+++ b/tests/activemq.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: ../.
     environment:
-      - AMQP_TYPE=${EXT_AMQP_TYPE:-activemq}
-      - AMQP_URI=${EXT_AMQP_URI:-amqp://guest:guest@onlyoffice-activemq}
+      - AMQP_TYPE=${AMQP_TYPE:-activemq}
+      - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-activemq}
     stdin_open: true
     restart: always
     ports:
@@ -19,8 +19,8 @@ services:
     container_name: onlyoffice-activemq
     image: webcenter/activemq:5.14.3
     environment:
-      - ACTIVEMQ_USERS_guest=${EXT_ACTIVEMQ_USERS_guest:-guest}
-      - ACTIVEMQ_GROUPS_owners=${EXT_ACTIVEMQ_GROUPS_owners:-guest}
+      - ACTIVEMQ_USERS_guest=${ACTIVEMQ_USERS_guest:-guest}
+      - ACTIVEMQ_GROUPS_owners=${ACTIVEMQ_GROUPS_owners:-guest}
     restart: always
     networks:
      - onlyoffice
diff --git a/tests/mariadb.yml b/tests/mariadb.yml
index 323f9a1..c4d5674 100644
--- a/tests/mariadb.yml
+++ b/tests/mariadb.yml
@@ -7,12 +7,12 @@ services:
     depends_on:
       - onlyoffice-mariadb
     environment:
-      - DB_TYPE=${EXT_DB_TYPE:-mysql}
-      - DB_HOST=${EXT_DB_HOST:-onlyoffice-mariadb}
-      - DB_PORT=${EXT_DB_PORT:-3306}
-      - DB_NAME=${EXT_DB_NAME:-onlyoffice}
-      - DB_USER=${EXT_DB_USER:-onlyoffice}
-      - DB_PWD=${EXT_DB_PWD:-onlyoffice}
+      - DB_TYPE=${DB_TYPE:-mysql}
+      - DB_HOST=${DB_HOST:-onlyoffice-mariadb}
+      - DB_PORT=${DB_PORT:-3306}
+      - DB_NAME=${DB_NAME:-onlyoffice}
+      - DB_USER=${DB_USER:-onlyoffice}
+      - DB_PWD=${DB_PWD:-onlyoffice}
     stdin_open: true
     restart: always
     ports:
@@ -22,10 +22,10 @@ services:
     container_name: onlyoffice-mariadb
     image: mariadb:10.5
     environment:
-      - MYSQL_DATABASE=${EXT_MYSQL_DATABASE:-onlyoffice}
-      - MYSQL_USER=${EXT_MYSQL_USER:-onlyoffice}
-      - MYSQL_PASSWORD=${EXT_MYSQL_PASSWORD:-onlyoffice}
-      - MYSQL_ALLOW_EMPTY_PASSWORD=${EXT_MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
+      - MYSQL_USER=${MYSQL_USER:-onlyoffice}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=${MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
     restart: always
     volumes:
       - mysql_data:/var/lib/mysql
diff --git a/tests/mysql.yml b/tests/mysql.yml
index 42de695..1389a89 100644
--- a/tests/mysql.yml
+++ b/tests/mysql.yml
@@ -7,12 +7,12 @@ services:
     depends_on:
       - onlyoffice-mysql
     environment:
-      - DB_TYPE=${EXT_DB_TYPE:-mysql}
-      - DB_HOST=${EXT_DB_HOST:-onlyoffice-mysql}
-      - DB_PORT=${EXT_DB_PORT:-3306}
-      - DB_NAME=${EXT_DB_NAME:-onlyoffice}
-      - DB_USER=${EXT_DB_USER:-onlyoffice}
-      - DB_PWD=${EXT_DB_PWD:-onlyoffice}
+      - DB_TYPE=${DB_TYPE:-mysql}
+      - DB_HOST=${DB_HOST:-onlyoffice-mysql}
+      - DB_PORT=${DB_PORT:-3306}
+      - DB_NAME=${DB_NAME:-onlyoffice}
+      - DB_USER=${DB_USER:-onlyoffice}
+      - DB_PWD=${DB_PWD:-onlyoffice}
     stdin_open: true
     restart: always
     ports:
@@ -22,10 +22,10 @@ services:
     container_name: onlyoffice-mysql
     image: mysql:5.7
     environment:
-      - MYSQL_DATABASE=${EXT_MYSQL_DATABASE:-onlyoffice}
-      - MYSQL_USER=${EXT_MYSQL_USER:-onlyoffice}
-      - MYSQL_PASSWORD=${EXT_MYSQL_PASSWORD:-onlyoffice}
-      - MYSQL_ALLOW_EMPTY_PASSWORD=${EXT_MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
+      - MYSQL_USER=${MYSQL_USER:-onlyoffice}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=${MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
     restart: always
     volumes:
       - mysql_data:/var/lib/mysql
diff --git a/tests/postgres-old.yml b/tests/postgres-old.yml
index 13a61ed..237246c 100644
--- a/tests/postgres-old.yml
+++ b/tests/postgres-old.yml
@@ -7,11 +7,11 @@ services:
     depends_on:
       - onlyoffice-postgresql
     environment:
-      - POSTGRESQL_SERVER_HOST=${EXT_DB_HOST:-onlyoffice-postgresql}
-      - POSTGRESQL_SERVER_PORT=${EXT_DB_PORT:-5432}
-      - POSTGRESQL_SERVER_DB_NAME=${EXT_DB_NAME:-onlyoffice}
-      - POSTGRESQL_SERVER_USER=${EXT_DB_USER:-onlyoffice}
-      - POSTGRESQL_SERVER_PASS=${EXT_DB_PWD:-onlyoffice}
+      - POSTGRESQL_SERVER_HOST=${DB_HOST:-onlyoffice-postgresql}
+      - POSTGRESQL_SERVER_PORT=${DB_PORT:-5432}
+      - POSTGRESQL_SERVER_DB_NAME=${DB_NAME:-onlyoffice}
+      - POSTGRESQL_SERVER_USER=${DB_USER:-onlyoffice}
+      - POSTGRESQL_SERVER_PASS=${DB_PWD:-onlyoffice}
     stdin_open: true
     restart: always
     ports:
@@ -21,9 +21,9 @@ services:
     container_name: onlyoffice-postgresql
     image: postgres:9.5
     environment:
-      - POSTGRES_DB=${EXT_POSTGRES_DB:-onlyoffice}
-      - POSTGRES_USER=${EXT_POSTGRES_USER:-onlyoffice}
-      - POSTGRES_HOST_AUTH_METHOD=${EXT_POSTGRES_HOST_AUTH_METHOD:-trust}
+      - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
+      - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
+      - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
     restart: always
     expose:
       - '5432'
diff --git a/tests/postgres.yml b/tests/postgres.yml
index ff77a52..6ddf134 100644
--- a/tests/postgres.yml
+++ b/tests/postgres.yml
@@ -7,12 +7,12 @@ services:
     depends_on:
       - onlyoffice-postgresql
     environment:
-      - DB_TYPE=${EXT_DB_TYPE:-postgres}
-      - DB_HOST=${EXT_DB_HOST:-onlyoffice-postgresql}
-      - DB_PORT=${EXT_DB_PORT:-5432}
-      - DB_NAME=${EXT_DB_NAME:-onlyoffice}
-      - DB_USER=${EXT_DB_USER:-onlyoffice}
-      - DB_PWD=${EXT_DB_PWD:-onlyoffice}
+      - DB_TYPE=${DB_TYPE:-postgres}
+      - DB_HOST=${DB_HOST:-onlyoffice-postgresql}
+      - DB_PORT=${DB_PORT:-5432}
+      - DB_NAME=${DB_NAME:-onlyoffice}
+      - DB_USER=${DB_USER:-onlyoffice}
+      - DB_PWD=${DB_PWD:-onlyoffice}
     stdin_open: true
     restart: always
     ports:
@@ -22,9 +22,9 @@ services:
     container_name: onlyoffice-postgresql
     image: postgres:9.5
     environment:
-      - POSTGRES_DB=${EXT_POSTGRES_DB:-onlyoffice}
-      - POSTGRES_USER=${EXT_POSTGRES_USER:-onlyoffice}
-      - POSTGRES_HOST_AUTH_METHOD=${EXT_POSTGRES_HOST_AUTH_METHOD:-trust}
+      - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
+      - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
+      - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
     restart: always
     expose:
       - '5432'
diff --git a/tests/rabbitmq-old.yml b/tests/rabbitmq-old.yml
index 4c3f15f..ce18691 100644
--- a/tests/rabbitmq-old.yml
+++ b/tests/rabbitmq-old.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: ../.
     environment:
-      - AMQP_SERVER_TYPE=${EXT_AMQP_SERVER_TYPE:-rabbitmq}
-      - AMQP_SERVER_URL=${EXT_AMQP_SERVER_URL:-amqp://guest:guest@onlyoffice-rabbitmq}
+      - AMQP_SERVER_TYPE=${AMQP_SERVER_TYPE:-rabbitmq}
+      - AMQP_SERVER_URL=${AMQP_SERVER_URL:-amqp://guest:guest@onlyoffice-rabbitmq}
     stdin_open: true
     restart: always
     ports:
diff --git a/tests/rabbitmq.yml b/tests/rabbitmq.yml
index cd0097f..f73501f 100644
--- a/tests/rabbitmq.yml
+++ b/tests/rabbitmq.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: ../.
     environment:
-      - AMQP_TYPE=${EXT_AMQP_TYPE:-rabbitmq}
-      - AMQP_URI=${EXT_AMQP_URI:-amqp://guest:guest@onlyoffice-rabbitmq}
+      - AMQP_TYPE=${AMQP_TYPE:-rabbitmq}
+      - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-rabbitmq}
     stdin_open: true
     restart: always
     ports:
diff --git a/tests/redis.yml b/tests/redis.yml
index 73988a7..9405b72 100644
--- a/tests/redis.yml
+++ b/tests/redis.yml
@@ -5,8 +5,8 @@ services:
     build:
       context: ../.
     environment:
-      - REDIS_SERVER_HOST=${EXT_REDIS_SERVER_HOST:-onlyoffice-redis}
-      - REDIS_SERVER_PORT=${EXT_REDIS_SERVER_PORT:-6379}
+      - REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-onlyoffice-redis}
+      - REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-6379}
     stdin_open: true
     restart: always
     ports: