diff --git a/tests/environment/alfresco-with-jolokia/Dockerfile b/tests/environment/alfresco-with-jolokia/Dockerfile
index 8e2937db15..6725db49dc 100644
--- a/tests/environment/alfresco-with-jolokia/Dockerfile
+++ b/tests/environment/alfresco-with-jolokia/Dockerfile
@@ -1,14 +1,15 @@
 # BUILD STAGE
-FROM alfresco/alfresco-content-repository:latest AS JOLOKIABUILDER
+FROM alpine:3.20.3 AS JOLOKIABUILDER
 
 ARG JOLOKIA_VER=2.1.2
-ARG TOMCAT_DIR=/usr/local/tomcat
 
 USER root
-RUN yum install -y curl-minimal unzip && \
+RUN apk update && \
+    apk add --no-cache curl unzip && \
     mkdir -p /build/jolokia && \
     curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-agent-war-unsecured/${JOLOKIA_VER}/jolokia-agent-war-unsecured-${JOLOKIA_VER}.war && \
-    unzip -q /build/jolokia.war -d /build/jolokia && chmod -R g+r,g-w,o= /build
+    unzip -q /build/jolokia.war -d /build/jolokia &&  \
+    chmod -R g+r,g-w,o= /build
 
 # ACTUAL IMAGE
 FROM alfresco/alfresco-content-repository:latest
diff --git a/tests/pipeline-all-amps/repo/Dockerfile b/tests/pipeline-all-amps/repo/Dockerfile
index 57c6f1abc1..28a0e6f9c6 100644
--- a/tests/pipeline-all-amps/repo/Dockerfile
+++ b/tests/pipeline-all-amps/repo/Dockerfile
@@ -1,11 +1,12 @@
 ARG BASE_IMAGE
 # BUILD STAGE SWAGGERBUILDER
-FROM alfresco/alfresco-enterprise-repo-base:latest AS SWAGGERBUILDER
+FROM alpine:3.20.3 AS SWAGGERBUILDER
 
 ARG JOLOKIA_VER=2.1.2
 
 USER root
-RUN yum install -y curl unzip && \
+RUN apk update && \
+    apk add --no-cache curl unzip && \
     mkdir -p /build/{api-explorer,gs-api-explorer,jolokia} && \
     curl -o /build/jolokia.war https://repo1.maven.org/maven2/org/jolokia/jolokia-agent-war-unsecured/${JOLOKIA_VER}/jolokia-agent-war-unsecured-${JOLOKIA_VER}.war && \
     unzip -q /build/jolokia.war -d /build/jolokia