diff --git a/docker-alfresco/ags/Dockerfile b/docker-alfresco/ags/Dockerfile
index cf739c604..eecdc26e2 100644
--- a/docker-alfresco/ags/Dockerfile
+++ b/docker-alfresco/ags/Dockerfile
@@ -1,4 +1,17 @@
-### Apply AGS community repo AMP to ACS image
+# BUILD STAGE AGS
+FROM debian:11-slim AS AGSBUILDER
+
+RUN export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update -qqy && apt-get -yqq install unzip && \
+    mkdir -p /build/gs-api-explorer
+
+### Copy the AGS war from the local context
+COPY target/gs-api-explorer-*.war /build
+
+RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
+    chmod -R g-w,o= /build
+
+# ACTUAL IMAGE
 FROM alfresco/alfresco-content-repository-community:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
@@ -13,11 +26,7 @@ RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
               /usr/local/tomcat/webapps/alfresco -directory -nobackup
 
 ### Copy gs-api-explorer war into webapps folder
-COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
-
-### Unpack gs-api-explorer.war
-RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/webapps/gs-api-explorer && \
-    jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
+COPY --chown=root:Alfresco --from=AGSBUILDER /build/gs-api-explorer /usr/local/tomcat/webapps/gs-api-explorer
 
 # All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
 RUN chgrp -R Alfresco /usr/local/tomcat && \
@@ -26,4 +35,4 @@ RUN chgrp -R Alfresco /usr/local/tomcat && \
     chmod -R g+r /usr/local/tomcat/webapps
 
 # Switching back to alfresco user after having added amps files to run the container as non-root
-USER alfresco
\ No newline at end of file
+USER alfresco
diff --git a/pom.xml b/pom.xml
index dab2b29a7..de4528c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,12 +9,12 @@
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>14.95</version>
+        <version>14.89</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>14.95</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>14.59</dependency.alfresco-community-share.version>
+        <dependency.alfresco-community-repo.version>14.89</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>14.53</dependency.alfresco-community-share.version>
         <dependency.acs-packaging.version>7.2.0-M2</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>