diff --git a/apps/nextcloud/.env b/apps/nextcloud/.env
index 126a8a482..90b1a464d 100644
--- a/apps/nextcloud/.env
+++ b/apps/nextcloud/.env
@@ -1,15 +1,14 @@
 W9_POWER_PASSWO=8dHZPFLFGoPXuC
-
-W9_NETWORK=websoft9
 W9_VERSION=26.0.1
-W9_HTTP_PORT=9001
-W9_NAME=nextcloud
+W9_ID=nextcloud
 
-W9_DB_MYSQL_VERSION=8.0
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$W9_NAME
-W9_DB_REDIS_VERSION=6
+W9_REPO=nextcloud
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
+
+W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
\ No newline at end of file
+W9_URL=appname.example.com
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/nextcloud/docker-compose.yml b/apps/nextcloud/docker-compose.yml
index 2baad4911..3c43157ff 100644
--- a/apps/nextcloud/docker-compose.yml
+++ b/apps/nextcloud/docker-compose.yml
@@ -4,37 +4,35 @@ version: '3.8'
 
 services:
   nextcloud:
-    image: nextcloud:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - ${W9_HTTP_PORT}:80
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - nextcloud:/var/www/html
       - nextcloud-data:/var/www/html/data
     env_file: .env
     environment:
-      - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
-      - MYSQL_USER=${W9_DB_MYSQL_USER}
-      - MYSQL_HOST=${W9_NAME}-db
+      - MYSQL_PASSWORD=${W9_POWER_PASSWO}
+      - MYSQL_DATABASE=${W9_ID}
+      - MYSQL_USER=${W9_ID}
+      - MYSQL_HOST=${W9_ID}-mysql
     links:
       - mysql
     restart: unless-stopped
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:8.0
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
     volumes:
       - mysql:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: ${W9_DB_MYSQL_NAME}
-      MYSQL_USER: ${W9_DB_MYSQL_USER}
-      MYSQL_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
+      MYSQL_DATABASE: ${W9_ID}
+      MYSQL_USER: ${W9_ID}
+      MYSQL_PASSWORD: ${W9_POWER_PASSWO}
+      MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO}
 
 volumes:
   nextcloud:
diff --git a/apps/nextcloud/variables.json b/apps/nextcloud/variables.json
index 7cf2b1a88..6811a25d4 100644
--- a/apps/nextcloud/variables.json
+++ b/apps/nextcloud/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "26.0.1",
         "latest"
       ]
     }
diff --git a/apps/nextterminal/.env b/apps/nextterminal/.env
index 9add68856..e610c525b 100644
--- a/apps/nextterminal/.env
+++ b/apps/nextterminal/.env
@@ -1,8 +1,14 @@
-W9_NAME=nextterminal
+W9_ID=nextterminal
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 W9_USER=admin
 W9_PASSWORD=admin
+
+W9_REPO=dushixiang/next-terminal
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8088
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
\ No newline at end of file
+W9_URL=appname.example.com
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/nextterminal/docker-compose.yml b/apps/nextterminal/docker-compose.yml
index 3e0254bca..6248ce7eb 100644
--- a/apps/nextterminal/docker-compose.yml
+++ b/apps/nextterminal/docker-compose.yml
@@ -6,26 +6,28 @@ version: '3.8'
 services:
   guacd:
     image: dushixiang/guacd:latest
-    container_name: ${W9_NAME}-guacd
+    container_name: ${W9_ID}-guacd
     volumes:
       - guacd:/usr/local/next-terminal/data
     restart:
       always
+    env_file: .env
           
   next-terminal:
-    image: dushixiang/next-terminal:$W9_VERSION
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:$W9_VERSION
+    container_name: ${W9_ID}
     environment:
       DB: sqlite
       GUACD_HOSTNAME: guacd
       GUACD_PORT: 4822
     ports:
-      - "${W9_HTTP_PORT}:8088"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     volumes:
       - /etc/localtime:/etc/localtime
       - next_terminal:/usr/local/next-terminal/data
     restart:
       always
+    env_file: .env
       
 networks:
   default:
diff --git a/apps/nextterminal/variables.json b/apps/nextterminal/variables.json
index 7d1229ec7..8b085a01f 100644
--- a/apps/nextterminal/variables.json
+++ b/apps/nextterminal/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/nocobase/.env b/apps/nocobase/.env
index 874c404e6..9ef5926f3 100644
--- a/apps/nocobase/.env
+++ b/apps/nocobase/.env
@@ -1,15 +1,17 @@
 # COMMENT
 W9_POWER_PASSWO=UGz0IARz117ssO%
-
-W9_NAME=nocobase
+W9_ID=nocobase
 W9_VERSION=main
-W9_HTTP_PORT=9001
-W9_NETWORK=websoft9
 
-W9_USER=admin@nocobase.com
-W9_PASSWORD=admin123
+W9_REPO=nocobase/nocobase
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
 
-W9_DB_MYSQL_VERSION=8
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$W9_NAME
\ No newline at end of file
+W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+W9_URL=appname.example.com
+W9_PASSWORD=admin123
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/nocobase/docker-compose.yml b/apps/nocobase/docker-compose.yml
index add0b14e0..1643291ba 100644
--- a/apps/nocobase/docker-compose.yml
+++ b/apps/nocobase/docker-compose.yml
@@ -6,35 +6,37 @@ version: '3.8'
 
 services:
   app:
-    image: nocobase/nocobase:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     restart: unless-stopped
     depends_on:
       - mysql
     environment:
       - DB_DIALECT=mysql
-      - DB_HOST=$W9_NAME-db
-      - DB_DATABASE=$W9_DB_MYSQL_NAME
-      - DB_USER=$W9_DB_MYSQL_USER
-      - DB_PASSWORD=$W9_DB_MYSQL_PASSWORD
+      - DB_HOST=$W9_ID-mysql
+      - DB_DATABASE=$W9_ID
+      - DB_USER=$W9_ID
+      - DB_PASSWORD=$W9_POWER_PASSWO
       - LOCAL_STORAGE_BASE_URL=/storage/uploads
     volumes:
       - nocobase:/app/nocobase/storage
     ports:
-      - "$W9_HTTP_PORT:80"
+      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
+    env_file: .env
 
   mysql:
     image: mysql:8
-    container_name: $W9_NAME-db
+    container_name: $W9_ID-mysql
     environment:
-      MYSQL_DATABASE: $W9_DB_MYSQL_NAME
-      MYSQL_USER: $W9_DB_MYSQL_USER
-      MYSQL_PASSWORD: $W9_DB_MYSQL_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_DB_MYSQL_PASSWORD
+      MYSQL_DATABASE: $W9_ID
+      MYSQL_USER: $W9_ID
+      MYSQL_PASSWORD: $W9_POWER_PASSWO
+      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO
     restart: unless-stopped
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
      - mysql:/var/lib/mysql
+    env_file: .env
 
 networks:
   default:
diff --git a/apps/nocobase/variables.json b/apps/nocobase/variables.json
index 33a1c3958..f02231481 100644
--- a/apps/nocobase/variables.json
+++ b/apps/nocobase/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/nocodb/.env b/apps/nocodb/.env
index 057d45d20..dc6d12ca0 100644
--- a/apps/nocodb/.env
+++ b/apps/nocodb/.env
@@ -1,15 +1,16 @@
 # COMMENT
 W9_POWER_PASSWO=UGz0IARz117ssO%
-
-W9_NAME=nocodb
+W9_ID=nocodb
 W9_VERSION=latest
-W9_HTTP_PORT=9001
 
-W9_NETWORK=websoft9
+W9_REPO=nocodb/nocodb
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8080
+W9_HTTP_PORT_SET=9001
 
-W9_DB_POSTGRESQL_VERSION=latest
-W9_DB_POSTGRESQL_PORT=5432
-W9_DB_POSTGRESQL_PASSWORD=123456
-W9_DB_POSTGRESQL_NAME=nocodb
-W9_DB_POSTGRESQL_USER=nocodb
-W9_DB_POSTGRESQL_HOST=db
\ No newline at end of file
+W9_NETWORK=websoft9
+W9_URL_REPLACE=false
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="postgresql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/nocodb/docker-compose.yml b/apps/nocodb/docker-compose.yml
index 0d47ed6c3..4421f3147 100644
--- a/apps/nocodb/docker-compose.yml
+++ b/apps/nocodb/docker-compose.yml
@@ -8,27 +8,27 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    image: nocodb/nocodb:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - "${W9_HTTP_PORT}:8080"
+      - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}"
     restart: unless-stopped
     volumes: 
       - "nocodb:/usr/app/data"
     environment:
-      NC_DB: "pg://${W9_NAME}-postgre:5432?u=${W9_DB_POSTGRESQL_USER}&p=${W9_DB_POSTGRESQL_PASSWORD}&d=${W9_DB_POSTGRESQL_NAME}"
+      NC_DB: "pg://${W9_ID}-postgresql:5432?u=${W9_ID}&p=${W9_POWER_PASSWO}&d=${W9_ID}"
 
   db:
-    image: postgres:${W9_DB_POSTGRESQL_VERSION}
-    container_name: ${W9_NAME}-postgre
-    hostname: ${W9_NAME}-postgre
+    image: postgres:latest
+    container_name: ${W9_ID}-postgresql
+    hostname: ${W9_ID}-postgresql
     restart: unless-stopped
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ${W9_DB_POSTGRESQL_PASSWORD}
-      POSTGRES_USER: ${W9_DB_POSTGRESQL_USER}
-      POSTGRES_DB: ${W9_DB_POSTGRESQL_NAME}
+      POSTGRES_PASSWORD: ${W9_POWER_PASSWO}
+      POSTGRES_USER: ${W9_ID}
+      POSTGRES_DB: ${W9_ID}
     healthcheck:
       test: pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"
       interval: 10s
diff --git a/apps/nocodb/variables.json b/apps/nocodb/variables.json
index 791c67785..7d9835fe2 100644
--- a/apps/nocodb/variables.json
+++ b/apps/nocodb/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/nopcommerce/.env b/apps/nopcommerce/.env
index 3ac83f893..e81dde9c5 100644
--- a/apps/nopcommerce/.env
+++ b/apps/nopcommerce/.env
@@ -1,11 +1,13 @@
 W9_POWER_PASSWO=spJNF09yzwWJaG!
 W9_VERSION=latest
-W9_HTTP_PORT=9001
-W9_NAME=nopcommerce
+W9_ID=nopcommerce
+
+W9_REPO=nopcommerceteam/nopcommerce
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
 
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$nopcommerce
 W9_NETWORK=websoft9
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/nopcommerce/docker-compose.yml b/apps/nopcommerce/docker-compose.yml
index 5d25bf414..2da7616d5 100644
--- a/apps/nopcommerce/docker-compose.yml
+++ b/apps/nopcommerce/docker-compose.yml
@@ -5,10 +5,10 @@ version: '3.8'
 
 services:
   nopcommerce:
-    image: nopcommerceteam/nopcommerce:$W9_VERSION
-    container_name: $W9_NAME
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
     ports:
-      - ${W9_HTTP_PORT}:80
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - nopcommerce:/app
     depends_on: 
@@ -16,11 +16,9 @@ services:
     restart: unless-stopped
 
   mysql:
-    image: mysql:$W9_DB_MYSQL_VERSION
-    container_name: $W9_NAME-db
+    image: mysql:5.7
+    container_name: $W9_ID-mysql
     restart: unless-stopped
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
     command: 
       - --character-set-server=utf8mb4 
       - --collation-server=utf8mb4_unicode_ci
@@ -28,10 +26,10 @@ services:
     volumes:
       - mysql:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: $W9_DB_MYSQL_NAME
-      MYSQL_USER: $W9_DB_MYSQL_USER
-      MYSQL_PASSWORD: $W9_DB_MYSQL_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_DB_MYSQL_PASSWORD
+      MYSQL_DATABASE: $W9_ID
+      MYSQL_USER: $W9_ID
+      MYSQL_PASSWORD: $W9_POWER_PASSWO
+      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO
 
 networks:
   default:
diff --git a/apps/nopcommerce/variables.json b/apps/nopcommerce/variables.json
index 50b53c9ba..bf7b04ef8 100644
--- a/apps/nopcommerce/variables.json
+++ b/apps/nopcommerce/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/odoo/.env b/apps/odoo/.env
index fa22a9f02..d62522a05 100644
--- a/apps/odoo/.env
+++ b/apps/odoo/.env
@@ -1,15 +1,15 @@
-# database name must be postgres, Odoo don't support other db
-W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
-W9_DB_POSTGRESQL_VERSION=14
-W9_DB_POSTGRESQL_PORT=5432
-W9_DB_POSTGRESQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_POSTGRESQL_NAME=postgres
-W9_DB_POSTGRESQL_USER=odoo
-W9_DB_POSTGRESQL_HOST=postgres
 # only test on odoo14
 W9_VERSION=16.0
-W9_HTTP_PORT=9001
-W9_NAME=odoo
+W9_POWER_PASSWO=8dHZPFLFGoPXuC
+W9_ID=odoo
+W9_REPO=odoo
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=8069
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
\ No newline at end of file
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="postgresql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/odoo/docker-compose.yml b/apps/odoo/docker-compose.yml
index 47069d1b5..8faeb93b3 100644
--- a/apps/odoo/docker-compose.yml
+++ b/apps/odoo/docker-compose.yml
@@ -5,38 +5,37 @@ version: "3.8"
 
 services:
   odoo:
-    image: odoo:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: ${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-      - ${W9_HTTP_PORT}:8069
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
     volumes:
       - odoo_web:/var/lib/odoo
       - odoo_config:/etc/odoo
       - odoo_addons:/mnt/extra-addons
     env_file: .env
     environment:
-      HOST: ${W9_NAME}-db
-      USER: ${W9_DB_POSTGRESQL_USER}
-      PASSWORD: ${W9_DB_POSTGRESQL_PASSWORD}
+      HOST: ${W9_ID}-postgresql
+      USER: ${W9_ID}
+      PASSWORD: ${W9_POWER_PASSWO}
     depends_on:
       - db
     restart: unless-stopped
 
   db:
-    image: postgres:${W9_DB_POSTGRESQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: postgres:14
+    container_name: ${W9_ID}-postgresql
     restart: unless-stopped
-    ports:
-      - ${W9_DB_POSTGRESQL_PORT}:5432
     volumes:
       - postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_DB: ${W9_DB_POSTGRESQL_NAME}
-      POSTGRES_USER: ${W9_DB_POSTGRESQL_USER}
-      POSTGRES_PASSWORD: ${W9_DB_POSTGRESQL_PASSWORD}
+      POSTGRES_DB: postgres
+      POSTGRES_USER: ${W9_ID}
+      POSTGRES_PASSWORD: ${W9_POWER_PASSWO}
       POSTGRES_INITDB_ARGS: --data-checksums
       POSTGRES_HOST_AUTH_METHOD: trust
       PGDATA: /var/lib/postgresql/data
+    env_file: .env
 
 volumes:
   odoo_web:
diff --git a/apps/odoo/variables.json b/apps/odoo/variables.json
index 724eb7773..144934d30 100644
--- a/apps/odoo/variables.json
+++ b/apps/odoo/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "16.0",
         "latest"
       ]
     }
diff --git a/apps/onlyoffice/.env b/apps/onlyoffice/.env
index 7fbf46fc8..264f56674 100644
--- a/apps/onlyoffice/.env
+++ b/apps/onlyoffice/.env
@@ -1,15 +1,20 @@
 # default db root password is 123456
 # default version:5.7
-W9_POWER_PASSWO=8dHZPFLFGoPXuC
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=onlyoffice
-W9_DB_MYSQL_USER=onlyoffice
 
 W9_VERSION=latest
-W9_HTTP_PORT=9003
-W9_NAME=onlyoffice
+W9_ID=onlyoffice
+W9_POWER_PASSWO=8dHZPFLFGoPXuC
+W9_REPO=onlyoffice/communityserver
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9003
+W9_HTTPS_PORT_SET=443
+W9_SET_PORT=5222
+W9_SET_PORT_SET=5222
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
\ No newline at end of file
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/onlyoffice/docker-compose.yml b/apps/onlyoffice/docker-compose.yml
index 758a8554f..ae4370c17 100644
--- a/apps/onlyoffice/docker-compose.yml
+++ b/apps/onlyoffice/docker-compose.yml
@@ -4,15 +4,13 @@
 version: '3.8'
 services:
   onlyoffice-mysql-server:
-    container_name: ${W9_NAME}-db
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
+    container_name: ${W9_ID}-mysql
+    image: mysql:5.7
     environment:
-     - MYSQL_DATABASE=${W9_DB_MYSQL_NAME}
-     - MYSQL_USER=${W9_DB_MYSQL_USER}
-     - MYSQL_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-     - MYSQL_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
+     - MYSQL_DATABASE=${W9_ID}
+     - MYSQL_USER=${W9_ID}
+     - MYSQL_PASSWORD=${W9_POWER_PASSWO}
+     - MYSQL_ROOT_PASSWORD=${W9_POWER_PASSWO}
     stdin_open: true
     tty: true
     restart: unless-stopped
@@ -22,8 +20,8 @@ services:
      - mysql_data:/var/lib/mysql
      
   onlyoffice-community-server:
-    container_name: ${W9_NAME}
-    image: onlyoffice/communityserver:${W9_VERSION}
+    container_name: ${W9_ID}
+    image: ${W9_REPO}:${W9_VERSION}
     depends_on:
      - onlyoffice-mysql-server
      - onlyoffice-document-server
@@ -35,15 +33,15 @@ services:
      - DOCUMENT_SERVER_JWT_ENABLED=false
      - DOCUMENT_SERVER_JWT_SECRET=jwt_secret
      - DOCUMENT_SERVER_JWT_HEADER=AuthorizationJwt
-     - MYSQL_SERVER_ROOT_PASSWORD=${W9_DB_MYSQL_PASSWORD}
-     - MYSQL_SERVER_DB_NAME=${W9_DB_MYSQL_NAME}
-     - MYSQL_SERVER_HOST=${W9_NAME}-db
-     - MYSQL_SERVER_USER=${W9_DB_MYSQL_USER}
-     - MYSQL_SERVER_PASS=${W9_DB_MYSQL_PASSWORD}
+     - MYSQL_SERVER_ROOT_PASSWORD=${W9_POWER_PASSWO}
+     - MYSQL_SERVER_DB_NAME=${W9_ID}
+     - MYSQL_SERVER_HOST=${W9_ID}-mysql
+     - MYSQL_SERVER_USER=${W9_ID}
+     - MYSQL_SERVER_PASS=${W9_POWER_PASSWO}
     ports:
-     - '${W9_HTTP_PORT}:80'
-     - '443'
-     - '5222:5222'
+     - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
+     - '${W9_HTTPS_PORT_SET}'
+     - '${W9_SET_PORT_SET}:${W9_SET_PORT}'
     stdin_open: true
     tty: true
     restart: unless-stopped
@@ -55,9 +53,10 @@ services:
      - document_data:/var/www/onlyoffice/DocumentServerData
      - /sys/fs/cgroup:/sys/fs/cgroup:ro
      - ./certs:/var/www/onlyoffice/Data/certs
+    env_file: .env
      
   onlyoffice-document-server:
-    container_name: ${W9_NAME}-docs
+    container_name: ${W9_ID}-docs
     image: onlyoffice/documentserver:7.0
     stdin_open: true
     tty: true
@@ -76,9 +75,10 @@ services:
       - document_log:/var/log/onlyoffice
       - ./document_fonts:/usr/share/fonts/truetype/custom
       - document_forgotten:/var/lib/onlyoffice/documentserver/App_Data/cache/files/forgotten
+    env_file: .env
 
   onlyoffice-control-panel:
-    container_name: ${W9_NAME}-control
+    container_name: ${W9_ID}-control
     depends_on:
      - onlyoffice-document-server
      - onlyoffice-community-server
@@ -95,6 +95,7 @@ services:
       - controlpanel_log:/var/log/onlyoffice
     stdin_open: true
     tty: true
+    env_file: .env
 
 volumes:
   document_data:
diff --git a/apps/onlyoffice/variables.json b/apps/onlyoffice/variables.json
index ad8334096..c61a9f793 100644
--- a/apps/onlyoffice/variables.json
+++ b/apps/onlyoffice/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/onlyofficedocs/.env b/apps/onlyofficedocs/.env
index 53850ebd7..848f05b6a 100644
--- a/apps/onlyofficedocs/.env
+++ b/apps/onlyofficedocs/.env
@@ -1,17 +1,23 @@
 # [documentserver, documentserver-ee]
-W9_REPO=documentserver
 W9_VERSION=7.4
-W9_HTTP_PORT=9002
-W9_NAME=onlyofficedocs
+W9_ID=onlyofficedocs
+
+#REDIS_SERVER_HOST
+#REDIS_SERVER_PORT
+W9_REPO=onlyoffice/documentserver
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9002
+
 W9_NETWORK=websoft9
 W9_URL_REPLACE=false
 W9_URL=appname.example.com
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
+
 # [true, false]
 JWT_ENABLED=false
 JWT_SECRET=sBPF1mjEbQ2bzj31entX
 JWT_HEADER=Authorization
 JWT_IN_BODY=false
-GENERATE_FONTS=true
-
-#REDIS_SERVER_HOST
-#REDIS_SERVER_PORT
+GENERATE_FONTS=true
\ No newline at end of file
diff --git a/apps/onlyofficedocs/docker-compose.yml b/apps/onlyofficedocs/docker-compose.yml
index dfa0756a0..876d379ac 100644
--- a/apps/onlyofficedocs/docker-compose.yml
+++ b/apps/onlyofficedocs/docker-compose.yml
@@ -6,15 +6,15 @@
 version: '3.8'
 services:     
   onlyofficedocs:
-    container_name: ${W9_NAME}
-    image: onlyoffice/${W9_REPO}:${W9_VERSION}
+    container_name: ${W9_ID}
+    image: ${W9_REPO}:${W9_VERSION}
     stdin_open: true
     tty: true
     restart: unless-stopped
     env_file:
       - .env
     ports:
-     - '${W9_HTTP_PORT}:80'
+     - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
     expose:
       - '80'
       - '443'
diff --git a/apps/onlyofficedocs/variables.json b/apps/onlyofficedocs/variables.json
index 180ad7307..39673fbcd 100644
--- a/apps/onlyofficedocs/variables.json
+++ b/apps/onlyofficedocs/variables.json
@@ -7,14 +7,7 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
+        "7.4",
         "latest"
       ]
     }
diff --git a/apps/opencart/.env b/apps/opencart/.env
index 6ad4fe07e..bc17706dd 100644
--- a/apps/opencart/.env
+++ b/apps/opencart/.env
@@ -1,12 +1,15 @@
 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3!
 W9_VERSION=latest
-W9_HTTP_PORT=9001
-W9_NAME=opencart
+W9_ID=opencart
+
+W9_REPO=websoft9dev/opencart
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_HTTP_PORT=80
+W9_HTTP_PORT_SET=9001
+
 W9_NETWORK=websoft9
-W9_DB_MYSQL_VERSION=5.7
-W9_DB_MYSQL_PORT=3306
-W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO
-W9_DB_MYSQL_NAME=$W9_NAME
-W9_DB_MYSQL_USER=$W9_NAME
 W9_URL_REPLACE=false
-W9_URL=appname.example.com
\ No newline at end of file
+W9_URL=appname.example.com
+W9_DIST=community
+W9_DB_EXPOSE="mysql"
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/opencart/docker-compose.yml b/apps/opencart/docker-compose.yml
index 82f410756..186ddbde5 100644
--- a/apps/opencart/docker-compose.yml
+++ b/apps/opencart/docker-compose.yml
@@ -4,21 +4,21 @@ version: '3.8'
 
 services:
   opencart:
-    image: websoft9dev/opencart:${W9_VERSION}
-    container_name: ${W9_NAME}
+    image: $W9_REPO:${W9_VERSION}
+    container_name: ${W9_ID}
     ports:
-     - ${W9_HTTP_PORT}:80
+     - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}'
     volumes:
       - opencart:/var/www/html
       - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
     restart: unless-stopped
     env_file: .env
     environment:
-      MYSQL_DATABASE: ${W9_DB_MYSQL_NAME}
-      MYSQL_USER: ${W9_DB_MYSQL_USER}
-      MYSQL_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
-      MYSQL_HOST: ${W9_NAME}-db
+      MYSQL_DATABASE: ${W9_ID}
+      MYSQL_USER: ${W9_ID}
+      MYSQL_PASSWORD: ${W9_POWER_PASSWO}
+      MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO}
+      MYSQL_HOST: ${W9_ID}-mysql
     links: 
       - mysql
     command: bash -c "cat /my_cmd > /cmd.sh && chmod +x /cmd.sh && /cmd.sh"
@@ -26,19 +26,18 @@ services:
       - source: my_cmd
 
   mysql:
-    image: mysql:${W9_DB_MYSQL_VERSION}
-    container_name: ${W9_NAME}-db
+    image: mysql:5.7
+    container_name: ${W9_ID}-mysql
     restart: unless-stopped
-    ports:
-     - ${W9_DB_MYSQL_PORT}:3306
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     volumes:
       - mysql_data:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: ${W9_DB_MYSQL_NAME}
-      MYSQL_USER: ${W9_DB_MYSQL_USER}
-      MYSQL_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
-      MYSQL_ROOT_PASSWORD: ${W9_DB_MYSQL_PASSWORD}
+      MYSQL_DATABASE: ${W9_ID}
+      MYSQL_USER: ${W9_ID}
+      MYSQL_PASSWORD: ${W9_POWER_PASSWO}
+      MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO}
+    env_file: .env
 
 networks:
   default:
diff --git a/apps/opencart/variables.json b/apps/opencart/variables.json
index 6a83faa52..3530c6e54 100644
--- a/apps/opencart/variables.json
+++ b/apps/opencart/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }
diff --git a/apps/opensearch/.env b/apps/opensearch/.env
index ca6d96f8e..2857a6119 100644
--- a/apps/opensearch/.env
+++ b/apps/opensearch/.env
@@ -2,8 +2,18 @@
 # otherwise opensearch can't running
 
 W9_VERSION=latest
-W9_NETWORK=websoft9
-W9_NAME=opensearch
+W9_ID=opensearch
 W9_USER=admin
 W9_PASSWORD=admin
-W9_HTTP_PORT=5601
+
+W9_REPO=opensearchproject/opensearch
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_NETWORK=websoft9
+W9_HTTP_PORT=9200
+W9_HTTP_PORT_SET=9200
+W9_MAGE_PORT=9600
+W9_MAGE_PORT_SET=9600
+W9_DASH_PORT=5601
+W9_DASH_PORT_SET=5601
+W9_DIST=community
+#### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/opensearch/docker-compose.yml b/apps/opensearch/docker-compose.yml
index efeb5330b..3108c16d9 100644
--- a/apps/opensearch/docker-compose.yml
+++ b/apps/opensearch/docker-compose.yml
@@ -5,8 +5,8 @@
 version: '3'
 services:
   opensearch-node1:
-    image: opensearchproject/opensearch:$W9_VERSION
-    container_name: $W9_NAME-node1
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID-node1
     env_file:
       - .env
     environment:
@@ -26,12 +26,12 @@ services:
     volumes:
       - opensearch-data1:/usr/share/opensearch/data
     ports:
-      - 9200:9200
-      - 9600:9600 # required for Performance Analyzer
+      - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
+      - ${W9_MAGE_PORT_SET}:${W9_MAGE_PORT} # required for Performance Analyzer
 
   opensearch-node2:
     image: opensearchproject/opensearch:$W9_VERSION
-    container_name: $W9_NAME-node2
+    container_name: $W9_ID-node2
     env_file:
       - .env
     environment:
@@ -53,11 +53,11 @@ services:
 
   opensearch-dashboards:
     image: opensearchproject/opensearch-dashboards:$W9_VERSION
-    container_name: $W9_NAME
+    container_name: $W9_ID
     env_file:
       - .env
     ports:
-      - 5601:5601
+      - ${W9_DASH_PORT_SET}:${W9_DASH_PORT}
     expose:
       - "5601"
     environment:
diff --git a/apps/opensearch/variables.json b/apps/opensearch/variables.json
index db46c694f..f8625650b 100644
--- a/apps/opensearch/variables.json
+++ b/apps/opensearch/variables.json
@@ -7,14 +7,6 @@
     {
       "dist": "community",
       "version": [
-        "2.2",
-        "latest"
-      ]
-    },
-    {
-      "dist": "enterprise",
-      "version": [
-        "1.8.2",
         "latest"
       ]
     }