diff --git a/README.md b/README.md
index e467b0da..0d0961e2 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Contains the common transformer (T-Engine) code, plus a few actual implementatio
 
 The project can be built by running the Maven command:
 ```bash
-mvn clean install -DskipTests -Plocal
+mvn clean install -Plocal,docker-it-setup
 ```
 > The `local` Maven profile builds local Docker images for each T-Engine.
 
diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile
index 60c5d643..13ebcb22 100644
--- a/alfresco-docker-imagemagick/Dockerfile
+++ b/alfresco-docker-imagemagick/Dockerfile
@@ -4,8 +4,10 @@
 
 FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81
 
-ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-linux.rpm
-ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/7.0.7-27/imagemagick-distribution-7.0.7-27-libs-linux.rpm
+ARG IMAGEMAGICK_VERSION=7.0.7-27
+
+ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm
+ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm
 ENV IMAGEMAGICK_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
 ENV JAVA_OPTS=""
 
diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile
index d980033e..ba09549f 100644
--- a/alfresco-docker-libreoffice/Dockerfile
+++ b/alfresco-docker-libreoffice/Dockerfile
@@ -4,7 +4,9 @@
 
 FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81
 
-ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/6.1.6/libreoffice-dist-6.1.6-linux.gz
+ARG LIBREOFFICE_VERSION=6.1.6
+
+ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
 ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
 ENV JAVA_OPTS=""
 
@@ -18,8 +20,8 @@ COPY target/alfresco-docker-libreoffice-${env.project_version}.jar libreoffice-d
 
 RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \
     yum install -y cairo cups-libs libSM && \
-    test -f libreoffice-dist-6.1.6-linux.gz && \
-    ln -s libreoffice-dist-6.1.6-linux.gz libreoffice-dist-linux.gz || \
+    test -f libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz && \
+    ln -s libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz libreoffice-dist-linux.gz || \
     curl -s -S $LIBREOFFICE_RPM_URL      -o libreoffice-dist-linux.gz && \
     curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \
     tar xzf libreoffice-dist-linux.gz && \