diff --git a/.github/workflows/tomcat.yaml b/.github/workflows/tomcat.yaml
new file mode 100644
index 0000000..51cecc1
--- /dev/null
+++ b/.github/workflows/tomcat.yaml
@@ -0,0 +1,21 @@
+name: cuilan/tomcat
+
+on:
+  #schedule:
+    #- cron: 0 1 * * 1
+  workflow_call:
+  workflow_dispatch:
+    inputs:
+      trigger:
+        description: Manually trigger
+        required: true
+        type: choice
+        options:
+          - build
+
+jobs:
+  centos:
+    uses: ./.github/workflows/.earthly.yaml
+    secrets: inherit
+    with:
+      build-dir: tomcat
\ No newline at end of file
diff --git a/tomcat/Earthfile b/tomcat/Earthfile
new file mode 100644
index 0000000..823e2d9
--- /dev/null
+++ b/tomcat/Earthfile
@@ -0,0 +1,28 @@
+VERSION 0.8
+
+DO ../udcs+BUILD_DATE
+
+TOMCAT:
+    COMMAND
+    DO ../udcs+LABEL
+    DO ../udcs/os/debian+UPGRADE
+    DO ../udcs/os/debian+COMMON_PKG
+    DO ../udcs/os/debian+LOCALE
+    DO ../udcs/os/debian+TIMEZONE
+    DO ../udcs+TINI
+
+    ENTRYPOINT ["tini","--"]
+
+    CMD ["catalina.sh" "run"]
+
+############################# runtime ##############################
+
+build-tomcat9.0.97-jre17:
+    DO ../udcs/image+TOMCAT8_JRE17
+    DO +TOMCAT
+
+    ARG --required BUILD_DATE
+
+    SAVE IMAGE --push cuilan/tomcat:latest cuilan/tomcat:9-jre17 cuilan/tomcat:9.0.97-jre17 cuilan/tomcat:9.0.97-jre17-${BUILD_DATE}
+
+  
\ No newline at end of file
diff --git a/udcs/image/Earthfile b/udcs/image/Earthfile
index f12ffa7..9fee7cd 100644
--- a/udcs/image/Earthfile
+++ b/udcs/image/Earthfile
@@ -156,6 +156,12 @@ JRE17_OPENJ9:
 
 # -------------------------------------
 
+TOMCAT8_JRE17:
+    FUNCTION
+    FROM tomcat:9.0.97-jre17-temurin-noble
+
+# -------------------------------------
+
 NODE:
     FUNCTION
     FROM node:lts-buster