diff --git a/tomcat/data.yml b/tomcat/data.yml
index a70071d..95f7d82 100755
--- a/tomcat/data.yml
+++ b/tomcat/data.yml
@@ -13,13 +13,6 @@ architectures:
   - amd64
   - arm64
 environments:
-  TOMCAT_PASSWORD:
-    description:
-      en: Admin Password
-      zh_CN: 管理员密码
-      zh_TW: 管理員密碼
-    type: password
-    default: ""
   TOMCAT_PORT_HTTP:
     description:
       en: HTTP Port
diff --git a/tomcat/docker-compose.yml b/tomcat/docker-compose.yml
index b5d887c..781fff7 100644
--- a/tomcat/docker-compose.yml
+++ b/tomcat/docker-compose.yml
@@ -1,13 +1,15 @@
 services:
   tomcat:
-    image: bitnami/tomcat:latest
+    image: tomcat:11.0.15-jre21
     restart: unless-stopped
-    environment:
-      - TOMCAT_PASSWORD=${TOMCAT_PASSWORD}
     ports:
       - ${TOMCAT_PORT_HTTP}:8080
     volumes:
-      - ./data:/bitnami/tomcat
+      - "./webapps:/usr/local/tomcat/webapps"
+      # Create your own tomcat-users.xml to enable the manager app
+      # - "./tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml"
+    entrypoint: |
+      bash -c 'cp -a webapps.dist/manager webapps/; exec catalina.sh run'
     networks:
       - acepanel-network
 networks: