diff --git a/alfresco-docker-imagemagick/Dockerfile b/alfresco-docker-imagemagick/Dockerfile
index 18053268..3746925c 100644
--- a/alfresco-docker-imagemagick/Dockerfile
+++ b/alfresco-docker-imagemagick/Dockerfile
@@ -1,4 +1,4 @@
-e# Image provides a container in which to run ImageMagick transformations for Alfresco Content Services.
+# Image provides a container in which to run ImageMagick transformations for Alfresco Content Services.
 
 FROM quay.io/alfresco/alfresco-base-java:9
 
@@ -11,8 +11,8 @@ RUN ln /usr/bin/alfresco-docker-imagemagick-${env.project_version}.jar /usr/bin/
     yum install -y wget && \
     wget $IMAGEMAGICK_RPM_URL && \
     wget $IMAGEMAGICK_LIB_RPM_URL && \
-    yum localinstall -y ImageMagick-*.x86_64.rpm && \
-    rm -f ImageMagick-*.x86_64.rpm && \
+    yum localinstall -y imagemagick-distribution-*-linux.rpm && \
+    rm -f imagemagick-distribution-*-linux.rpm && \
     yum remove -y wget && \
     yum clean all
 
diff --git a/alfresco-docker-libreoffice/Dockerfile b/alfresco-docker-libreoffice/Dockerfile
index e184fa44..118e5ccc 100644
--- a/alfresco-docker-libreoffice/Dockerfile
+++ b/alfresco-docker-libreoffice/Dockerfile
@@ -10,9 +10,9 @@ RUN ln /usr/bin/alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/
     yum install -y wget && \
     yum install -y cairo cups-libs libSM && \
     wget $LIBREOFFICE_RPM_URL && \
-    tar xzf LibreOffice_*_Linux_x86-64_rpm.tar.gz && \
+    tar xzf libreoffice-dist-*-linux.gz && \
     yum localinstall -y LibreOffice*/RPMS/*.rpm && \
-    rm -rf LibreOffice_*_Linux_x86-64_rpm.tar.gz LibreOffice_*_Linux_x86-64_rpm && \
+    rm -rf libreoffice-dist-*-linux.gz LibreOffice_*_Linux_x86-64_rpm && \
     yum remove -y wget && \
     yum clean all