diff --git a/config/Dockerfile b/config/Dockerfile
index 39b8a8a2..b90b4546 100644
--- a/config/Dockerfile
+++ b/config/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
-ARG BACKEND_IMAGE=tomee:8.0.16-jre17-webprofile
+ARG BACKEND_IMAGE=tomcat:9.0.93-jre17
 ARG FRONTEND_IMAGE=docker.angie.software/angie:latest
 
 FROM $BUILDER_IMAGE AS builder
@@ -28,17 +28,17 @@ FROM $BACKEND_IMAGE AS backend
 FROM $BACKEND_IMAGE AS backend
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY config/tomcat/tomee /usr/local/tomee
+COPY config/tomcat/tomcat /usr/local/tomcat
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+RUN rm -rf /usr/local/tomcat/webapps/ROOT \
+ && cat /usr/local/tomcat/conf/webbpm.properties >> /usr/local/tomcat/conf/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomcat/conf/tomcat-users.xml
 
-COPY --from=builder /app/backend/target/dashboard.war /usr/local/tomee/webapps/dashboard.war
+COPY --from=builder /app/backend/target/dashboard.war /usr/local/tomcat/webapps/dashboard.war
 
 
 FROM backend AS combo
-COPY --from=builder /app/frontend/target/frontend*.war /usr/local/tomee/webapps/ROOT.war
+COPY --from=builder /app/frontend/target/frontend*.war /usr/local/tomcat/webapps/ROOT.war
 
 FROM $FRONTEND_IMAGE AS frontend
 
diff --git a/config/Dockerfile.TC b/config/Dockerfile.TC
index edd072ce..5f78cf1a 100644
--- a/config/Dockerfile.TC
+++ b/config/Dockerfile.TC
@@ -1,13 +1,13 @@
 #Dockerfile for TeamCity build "run in docker"
 
-FROM tomee:8.0.16-jre17-webprofile
+FROM tomcat:9.0.93-jre17
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY tomcat/tomee /usr/local/tomee
+COPY tomcat/tomcat /usr/local/tomcat
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+RUN rm -rf /usr/local/tomcat/webapps/ROOT \
+ && cat /usr/local/tomcat/conf/webbpm.properties >> /usr/local/tomcat/conf/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomcat/conf/tomcat-users.xml
 
-COPY frontend.war /usr/local/tomee/webapps/ROOT.war
-COPY dashboard.war /usr/local/tomee/webapps/dashboard.war
+COPY frontend.war /usr/local/tomcat/webapps/ROOT.war
+COPY dashboard.war /usr/local/tomcat/webapps/dashboard.war
diff --git a/config/Dockerfile.backend b/config/Dockerfile.backend
index f1a660d2..3cca4077 100644
--- a/config/Dockerfile.backend
+++ b/config/Dockerfile.backend
@@ -1,5 +1,5 @@
 ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
-ARG RUNTIME_IMAGE=tomee:8.0.16-jre17-webprofile
+ARG RUNTIME_IMAGE=tomcat:9.0.93-jre17
 
 FROM $BUILDER_IMAGE AS builder
 
@@ -26,10 +26,10 @@ RUN mkdir -p $HOME/.m2 \
 FROM $RUNTIME_IMAGE
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY config/tomcat/tomee /usr/local/tomee
+COPY config/tomcat/tomcat /usr/local/tomcat
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+RUN rm -rf /usr/local/tomcat/webapps/ROOT \
+ && cat /usr/local/tomcat/conf/webbpm.properties >> /usr/local/tomcat/conf/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomcat/conf/tomcat-users.xml
 
-COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomee/webapps/dashboard.war
+COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomcat/webapps/dashboard.war