diff --git a/apps/bitwarden/.env b/apps/bitwarden/.env
new file mode 100644
index 000000000..835b1351f
--- /dev/null
+++ b/apps/bitwarden/.env
@@ -0,0 +1,45 @@
+W9_REPO=bitwarden/self-host
+W9_DIST=community
+W9_VERSION=beta
+
+W9_HTTP_PORT_SET=9001
+
+#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
+
+W9_ID=bitwarden
+W9_HTTP_PORT=8080
+W9_URL=bitwarden.test2.websoft9.cn
+W9_URL_REPLACE=true
+
+# Get from: https://bitwarden.com/host/
+# Why? https://bitwarden.com/help/hosting-faqs/#q-what-are-my-installation-id-and-installation-key-used-for
+# This must set after or before applicatin up
+W9_BW_INSTALLATION_ID_SET=00000000-0000-0000-0000-000000000000
+W9_BW_INSTALLATION_KEY_SET=xxxxxxxxxxxx
+
+W9_NETWORK=websoft9
+
+#### ----------------------------------------------------------------------------------------- ####
+
+
+# Below environment is created by bitwarden: https://github.com/bitwarden/self-host/blob/main/docker-unified/settings.env
+
+#####################
+# Required Settings #
+#####################
+
+# Server hostname
+BW_DOMAIN=$W9_URL
+
+# Database
+# Available providers are sqlserver, postgresql, mysql/mariadb, or sqlite
+BW_DB_PROVIDER=mysql
+BW_DB_SERVER=db
+BW_DB_DATABASE=bitwarden_vault
+BW_DB_USERNAME=bitwarden
+BW_DB_PASSWORD=super_strong_password
+
+# Installation information
+# Get your ID and key from https://bitwarden.com/host/
+BW_INSTALLATION_ID=$W9_BW_INSTALLATION_ID_SET
+BW_INSTALLATION_KEY=$W9_BW_INSTALLATION_KEY_SET
\ No newline at end of file
diff --git a/apps/bitwarden/CHANGELOG.md b/apps/bitwarden/CHANGELOG.md
new file mode 100644
index 000000000..582cf46c5
--- /dev/null
+++ b/apps/bitwarden/CHANGELOG.md
@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## Release
+### Fixes and Enhancements
+
diff --git a/apps/bitwarden/Notes.md b/apps/bitwarden/Notes.md
new file mode 100644
index 000000000..120fcd505
--- /dev/null
+++ b/apps/bitwarden/Notes.md
@@ -0,0 +1,5 @@
+# Bitwarden
+
+- need register ID and Key before install
+- Offcial docs not give a simple docker-compose install, it give install script
+
diff --git a/apps/bitwarden/docker-compose.yml b/apps/bitwarden/docker-compose.yml
new file mode 100644
index 000000000..4dc1b7ad8
--- /dev/null
+++ b/apps/bitwarden/docker-compose.yml
@@ -0,0 +1,42 @@
+# image: https://hub.docker.com/r/bitwarden/self-host
+# compose: https://github.com/bitwarden/self-host/blob/main/docker-unified/docker-compose.yml
+# environment: https://github.com/bitwarden/self-host/blob/main/docker-unified/settings.env
+# docs: https://bitwarden.com/help/install-on-premise-linux/
+
+version: '3.8'
+
+services:
+  bitwarden:
+    image: $W9_REPO:$W9_VERSION
+    container_name: $W9_ID
+    restart: unless-stopped
+    ports:
+      - $W9_HTTP_PORT_SET:8080
+    env_file: .env
+    volumes:
+      - bitwarden:/etc/bitwarden
+      - logs:/var/log/bitwarden
+    depends_on:
+      - db
+
+  db:
+    environment:
+      MARIADB_USER: "bitwarden"
+      MARIADB_PASSWORD: "super_strong_password"
+      MARIADB_DATABASE: "bitwarden_vault"
+      MARIADB_RANDOM_ROOT_PASSWORD: "true"
+    image: mariadb:10
+    container_name: $W9_ID-mariadb
+    restart: always
+    volumes:
+      - db:/var/lib/mysql
+
+volumes:
+  db:
+  bitwarden:
+  logs:
+    
+networks:
+  default:
+    name: $W9_NETWORK
+    external: true
\ No newline at end of file
diff --git a/apps/bitwarden/src/README.md b/apps/bitwarden/src/README.md
new file mode 100644
index 000000000..cdbd7a0b9
--- /dev/null
+++ b/apps/bitwarden/src/README.md
@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9
diff --git a/apps/bitwarden/variables.json b/apps/bitwarden/variables.json
new file mode 100644
index 000000000..45c0ee622
--- /dev/null
+++ b/apps/bitwarden/variables.json
@@ -0,0 +1,18 @@
+{
+  "name": "Bitwarden ",
+  "trademark": "bitwarden ",
+  "release": false,
+  "fork_url": "https://github.com/bitwarden/server",
+  "edition": [
+    {
+      "dist": "community",
+      "version": ["dev"]
+    }
+  ],
+  "requirements": {
+    "cpu": "1",
+    "memory": "2",
+    "disk": "1",
+    "url": "https://bitwarden.com/help/install-on-premise-linux/#system-specifications"
+  }
+}
diff --git a/apps/odoo/src/README.md b/apps/odoo/src/README.md
new file mode 100644
index 000000000..cdbd7a0b9
--- /dev/null
+++ b/apps/odoo/src/README.md
@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9
diff --git a/apps/odoo/src/after_up.sh b/apps/odoo/src/after_up.sh
deleted file mode 100644
index 8b1378917..000000000
--- a/apps/odoo/src/after_up.sh
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/apps/odoo/src/extra-addons/README.md b/apps/odoo/src/extra-addons/README.md
new file mode 100644
index 000000000..f7cabe93a
--- /dev/null
+++ b/apps/odoo/src/extra-addons/README.md
@@ -0,0 +1,3 @@
+# About
+
+This folder includes files for your Odoo development
diff --git a/apps/odoo/src/filelist b/apps/odoo/src/filelist
deleted file mode 100644
index 341240aed..000000000
--- a/apps/odoo/src/filelist
+++ /dev/null
@@ -1,3 +0,0 @@
-docker-compose.yml
-script/test.sh
-docker
\ No newline at end of file
diff --git a/apps/odoo/src/get_version.sh b/apps/odoo/src/get_version.sh
deleted file mode 100644
index 582741820..000000000
--- a/apps/odoo/src/get_version.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo echo Odoo Version:$(docker exec -it $1 odoo --version) 1>> /data/logs/install_version.txt
diff --git a/apps/template/README.md b/apps/template/README.md
deleted file mode 100644
index 6485b7e88..000000000
--- a/apps/template/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# AppName on Docker  
-
-This is an **Docker Compose solution** powered by [Websoft9](https://www.websoft9.com) based on Docker for AppName:
-
-
- - community:  2.2, latest
-
- - enterprise:  1.8.2, latest
-
-
-## System Requirements
-
-The following are the minimal [recommended requirements](https://github.com/onlyoffice/docker#recommended-system-requirements):
-
-* **RAM**: 4 GB or more
-* **CPU**: 2 cores or higher
-* **Disk**: at least 1 GB of free space
-* **bandwidth**: more fluent experience over 100M  
-
-## Install
-
-You can install this AppName by [How to use it?](https://github.com/Websoft9/docker-library#how-to-use-it).   
-
-If you want use AppName with **Websoft9 Business Support** free, you can [subscribe AppName](https://www.websoft9.com/apps) on Cloud platform
-
-## Documentation
-
-[AppName Administrator Guide](https://support.websoft9.com/docs/appname) powered by Websoft9
\ No newline at end of file