diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index d744c8c4..82582775 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -5,7 +5,7 @@
 
 # Prerequisites: pom.xml and appropriate project structure should exist in the repository.
 
-image: maven:3.6.3
+image: maven:3.9.3
 
 pipelines:
   branches:
diff --git a/distribution/Dockerfile b/distribution/Dockerfile
index 38d425f6..ffac2bf9 100644
--- a/distribution/Dockerfile
+++ b/distribution/Dockerfile
@@ -2,7 +2,8 @@
 # Based on ubuntu:latest, installs WiseMapping (http://ww.wisemapping.org)
 
 # Based info setup ...
-FROM --platform=$BUILDPLATFORM tomcat:9.0.71-jdk17
+#FROM --platform=$BUILDPLATFORM tomcat:9.0.71-jdk17
+FROM tomcat:9.0.76-jdk17
 LABEL maintainer="Paulo Gustavo Veiga <pveiga@wisemapping.com>"
 
 # Build variables ...