diff --git a/apps/redpandaconsole/.env b/apps/redpandaconsole/.env
index 9fbb4906e..3db55f0e9 100644
--- a/apps/redpandaconsole/.env
+++ b/apps/redpandaconsole/.env
@@ -1,13 +1,12 @@
-W9_ID=redpandaconsole
+W9_DIST=community
 W9_VERSION=latest
-
 W9_REPO=docker.redpanda.com/redpandadata/console
+
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=redpandaconsole
 W9_HTTP_PORT=3000
 W9_HTTP_PORT_SET=3000
-
 W9_NETWORK=websoft9
-W9_DIST=community
 #### --------------------------------------------------------------------------------------- ####
 
 # This is kafka's port, it need otherwise, can not access UI
diff --git a/apps/redpandaconsole/docker-compose.yml b/apps/redpandaconsole/docker-compose.yml
index 8a0463a79..3ba3f9c0c 100644
--- a/apps/redpandaconsole/docker-compose.yml
+++ b/apps/redpandaconsole/docker-compose.yml
@@ -1,6 +1,5 @@
-# image: https://hub.docker.com/r/bitnami/suitecrm
-# docs: https://github.com/bitnami/bitnami-docker-suitecrm
-
+# image: https://hub.docker.com/r/redpandadata/redpanda
+# docs: https://docs.redpanda.com/current/reference/docker-compose/
 
 version: '3.8'
 
@@ -12,7 +11,7 @@ services:
     env_file:
       - .env
     ports:
-      - "$W9_HTTP_PORT_SET:$W9_HTTP_PORT"
+      - $W9_HTTP_PORT_SET:3000
 
 networks:
   default:
diff --git a/apps/rethinkdb/.env b/apps/rethinkdb/.env
index e3b779aed..c4a28f86f 100644
--- a/apps/rethinkdb/.env
+++ b/apps/rethinkdb/.env
@@ -1,20 +1,15 @@
-W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
-
-W9_ID=rethinkdb
-W9_VERSION=2.4
-W9_LOGIN_USER=admin
+W9_VERSION=latest
 W9_REPO=rethinkdb
+W9_DIST=community
+W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+W9_ID=rethinkdb
 W9_HTTP_PORT=8080
 W9_HTTP_PORT_SET=9090
-W9_CLIENT_PORT=28015
 W9_CLIENT_PORT_SET=28015
-W9_CLUSTER_PORT=29015
 W9_CLUSTER_PORT_SET=29015
-
-W9_NETWORK=websoft9
+W9_LOGIN_USER=admin
 W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_URL_REPLACE=false
 W9_URL=appname.example.com
-W9_DIST=community
+W9_NETWORK=websoft9
 #### --------------------------------------------------------------------------------------- ####
\ No newline at end of file
diff --git a/apps/rethinkdb/docker-compose.yml b/apps/rethinkdb/docker-compose.yml
index 2da0a04d8..111922ba8 100644
--- a/apps/rethinkdb/docker-compose.yml
+++ b/apps/rethinkdb/docker-compose.yml
@@ -9,9 +9,9 @@ services:
     container_name: rethinkdb
     restart: unless-stopped
     ports:
-     - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}
-     - ${W9_CLIENT_PORT_SET}:${W9_CLIENT_PORT}
-     - ${W9_CLUSTER_PORT_SET}:${W9_CLUSTER_PORT}
+     - ${W9_HTTP_PORT_SET}:8080
+     - ${W9_CLIENT_PORT_SET}:28015
+     - ${W9_CLUSTER_PORT_SET}:29015
     env_file: .env
     command:
       - /bin/bash
diff --git a/apps/rethinkdb/src/after_up.sh b/apps/rethinkdb/src/after_up.sh
deleted file mode 100644
index 8b1378917..000000000
--- a/apps/rethinkdb/src/after_up.sh
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/apps/rethinkdb/src/filelist b/apps/rethinkdb/src/filelist
deleted file mode 100644
index 341240aed..000000000
--- a/apps/rethinkdb/src/filelist
+++ /dev/null
@@ -1,3 +0,0 @@
-docker-compose.yml
-script/test.sh
-docker
\ No newline at end of file