diff --git a/10.1/jdk11/temurin-jammy/Dockerfile b/10.1/jdk11/temurin-jammy/Dockerfile
index 04de6e78..d7ea0c07 100644
--- a/10.1/jdk11/temurin-jammy/Dockerfile
+++ b/10.1/jdk11/temurin-jammy/Dockerfile
@@ -145,4 +145,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/10.1/jdk17/temurin-jammy/Dockerfile b/10.1/jdk17/temurin-jammy/Dockerfile
index 1e0ef780..26f70d54 100644
--- a/10.1/jdk17/temurin-jammy/Dockerfile
+++ b/10.1/jdk17/temurin-jammy/Dockerfile
@@ -145,4 +145,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/10.1/jre11/temurin-jammy/Dockerfile b/10.1/jre11/temurin-jammy/Dockerfile
index 9bf06780..b5183bc1 100644
--- a/10.1/jre11/temurin-jammy/Dockerfile
+++ b/10.1/jre11/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/10.1/jre17/temurin-jammy/Dockerfile b/10.1/jre17/temurin-jammy/Dockerfile
index 42b525b1..255658ef 100644
--- a/10.1/jre17/temurin-jammy/Dockerfile
+++ b/10.1/jre17/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk11/temurin-focal/Dockerfile b/8.5/jdk11/temurin-focal/Dockerfile
index fcdbf6ce..75b262e1 100644
--- a/8.5/jdk11/temurin-focal/Dockerfile
+++ b/8.5/jdk11/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk11/temurin-jammy/Dockerfile b/8.5/jdk11/temurin-jammy/Dockerfile
index 013ae7e7..a7b294dd 100644
--- a/8.5/jdk11/temurin-jammy/Dockerfile
+++ b/8.5/jdk11/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk17/temurin-focal/Dockerfile b/8.5/jdk17/temurin-focal/Dockerfile
index 342d635c..a8de8bd1 100644
--- a/8.5/jdk17/temurin-focal/Dockerfile
+++ b/8.5/jdk17/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk17/temurin-jammy/Dockerfile b/8.5/jdk17/temurin-jammy/Dockerfile
index 7a0c3434..d7b5fc5f 100644
--- a/8.5/jdk17/temurin-jammy/Dockerfile
+++ b/8.5/jdk17/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk8/temurin-focal/Dockerfile b/8.5/jdk8/temurin-focal/Dockerfile
index c024b5d9..8ca1f394 100644
--- a/8.5/jdk8/temurin-focal/Dockerfile
+++ b/8.5/jdk8/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jdk8/temurin-jammy/Dockerfile b/8.5/jdk8/temurin-jammy/Dockerfile
index 458e3aae..594e0267 100644
--- a/8.5/jdk8/temurin-jammy/Dockerfile
+++ b/8.5/jdk8/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre11/temurin-focal/Dockerfile b/8.5/jre11/temurin-focal/Dockerfile
index ddc45cbe..2928bf7a 100644
--- a/8.5/jre11/temurin-focal/Dockerfile
+++ b/8.5/jre11/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre11/temurin-jammy/Dockerfile b/8.5/jre11/temurin-jammy/Dockerfile
index 21f309fa..15e539d2 100644
--- a/8.5/jre11/temurin-jammy/Dockerfile
+++ b/8.5/jre11/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre17/temurin-focal/Dockerfile b/8.5/jre17/temurin-focal/Dockerfile
index c17e8dcb..858cf02c 100644
--- a/8.5/jre17/temurin-focal/Dockerfile
+++ b/8.5/jre17/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre17/temurin-jammy/Dockerfile b/8.5/jre17/temurin-jammy/Dockerfile
index 9e6d30d1..ee37df64 100644
--- a/8.5/jre17/temurin-jammy/Dockerfile
+++ b/8.5/jre17/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre8/temurin-focal/Dockerfile b/8.5/jre8/temurin-focal/Dockerfile
index ebdd314a..62ec8fc1 100644
--- a/8.5/jre8/temurin-focal/Dockerfile
+++ b/8.5/jre8/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/8.5/jre8/temurin-jammy/Dockerfile b/8.5/jre8/temurin-jammy/Dockerfile
index b47fab82..523c4e00 100644
--- a/8.5/jre8/temurin-jammy/Dockerfile
+++ b/8.5/jre8/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk11/temurin-focal/Dockerfile b/9.0/jdk11/temurin-focal/Dockerfile
index edfd312a..27de2c36 100644
--- a/9.0/jdk11/temurin-focal/Dockerfile
+++ b/9.0/jdk11/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk11/temurin-jammy/Dockerfile b/9.0/jdk11/temurin-jammy/Dockerfile
index 7d808faf..20f688bd 100644
--- a/9.0/jdk11/temurin-jammy/Dockerfile
+++ b/9.0/jdk11/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk17/temurin-focal/Dockerfile b/9.0/jdk17/temurin-focal/Dockerfile
index d92c876e..f612cfaf 100644
--- a/9.0/jdk17/temurin-focal/Dockerfile
+++ b/9.0/jdk17/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk17/temurin-jammy/Dockerfile b/9.0/jdk17/temurin-jammy/Dockerfile
index efcd7f27..a094ac5f 100644
--- a/9.0/jdk17/temurin-jammy/Dockerfile
+++ b/9.0/jdk17/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk8/temurin-focal/Dockerfile b/9.0/jdk8/temurin-focal/Dockerfile
index 59da0520..8cebcbc0 100644
--- a/9.0/jdk8/temurin-focal/Dockerfile
+++ b/9.0/jdk8/temurin-focal/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jdk8/temurin-jammy/Dockerfile b/9.0/jdk8/temurin-jammy/Dockerfile
index 83879035..1594dc58 100644
--- a/9.0/jdk8/temurin-jammy/Dockerfile
+++ b/9.0/jdk8/temurin-jammy/Dockerfile
@@ -146,4 +146,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre11/temurin-focal/Dockerfile b/9.0/jre11/temurin-focal/Dockerfile
index 215cf5c6..646b1692 100644
--- a/9.0/jre11/temurin-focal/Dockerfile
+++ b/9.0/jre11/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre11/temurin-jammy/Dockerfile b/9.0/jre11/temurin-jammy/Dockerfile
index d97e737c..124da774 100644
--- a/9.0/jre11/temurin-jammy/Dockerfile
+++ b/9.0/jre11/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre17/temurin-focal/Dockerfile b/9.0/jre17/temurin-focal/Dockerfile
index 4c9051c4..b1388a67 100644
--- a/9.0/jre17/temurin-focal/Dockerfile
+++ b/9.0/jre17/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre17/temurin-jammy/Dockerfile b/9.0/jre17/temurin-jammy/Dockerfile
index 4bb651bf..f72c2217 100644
--- a/9.0/jre17/temurin-jammy/Dockerfile
+++ b/9.0/jre17/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre8/temurin-focal/Dockerfile b/9.0/jre8/temurin-focal/Dockerfile
index 848ab40f..b5751097 100644
--- a/9.0/jre8/temurin-focal/Dockerfile
+++ b/9.0/jre8/temurin-focal/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/9.0/jre8/temurin-jammy/Dockerfile b/9.0/jre8/temurin-jammy/Dockerfile
index 4399b8d7..5eb44d11 100644
--- a/9.0/jre8/temurin-jammy/Dockerfile
+++ b/9.0/jre8/temurin-jammy/Dockerfile
@@ -40,4 +40,10 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/Dockerfile.template b/Dockerfile.template
index 4eeabc7e..f835deac 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -277,4 +277,12 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+{{ if vendor_variant | contains("temurin") then ( -}}
+
+# upstream eclipse-temurin-provided script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302
+# use "/entrypoint.sh" at your own risk
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
+{{ ) else "" end -}}
 CMD ["catalina.sh", "run"]