diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7
index 4ddc1ff..2344c56 100644
--- a/builder/Dockerfile.centos-7
+++ b/builder/Dockerfile.centos-7
@@ -29,6 +29,8 @@ RUN yum -y update \
     pango-devel \
     pcre-devel \
     pcre2-devel \
+    python3 \
+    python3-pip \
     readline-devel \
     rpm-build \
     ruby \
@@ -45,15 +47,12 @@ RUN yum -y update \
     zlib-devel \
     && yum clean all
 
-# Install pip for python
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
-    python get-pip.py
-
 # Install AWS CLI.
-RUN pip install awscli --upgrade --user && \
+RUN pip3 install awscli --upgrade --user && \
     ln -s /root/.local/bin/aws /usr/bin/aws
 
-RUN gem install ffi:1.12.2 fpm
+# Pin fpm for compatibility with Ruby < 2.3
+RUN gem install ffi:1.12.2 fpm:1.11.0
 
 RUN chmod 0777 /opt
 
diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15
index b0bccd0..037760c 100644
--- a/builder/Dockerfile.opensuse-15
+++ b/builder/Dockerfile.opensuse-15
@@ -66,7 +66,8 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
 
 RUN pip install awscli
 
-RUN gem install fpm && ln -s /usr/lib64/ruby/gems/2.5.0/gems/fpm-1.11.0/bin/fpm /bin/fpm
+RUN gem install fpm && \
+    ln -s /usr/bin/fpm.ruby2.5 /usr/local/bin/fpm
 
 RUN chmod 0777 /opt
 
diff --git a/builder/Dockerfile.opensuse-152 b/builder/Dockerfile.opensuse-152
index a9fa0a9..bfd91af 100644
--- a/builder/Dockerfile.opensuse-152
+++ b/builder/Dockerfile.opensuse-152
@@ -66,7 +66,8 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
 
 RUN pip install awscli
 
-RUN gem install fpm && ln -s /usr/lib64/ruby/gems/2.5.0/gems/fpm-1.11.0/bin/fpm /bin/fpm
+RUN gem install fpm && \
+    ln -s /usr/bin/fpm.ruby2.5 /usr/local/bin/fpm
 
 RUN chmod 0777 /opt
 
diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42
index 95a4150..f7f9435 100644
--- a/builder/Dockerfile.opensuse-42
+++ b/builder/Dockerfile.opensuse-42
@@ -66,7 +66,9 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
 
 RUN pip install awscli
 
-RUN gem install ffi:1.12.2 fpm && ln -s /usr/lib64/ruby/gems/2.1.0/gems/fpm-1.11.0/bin/fpm /bin/fpm
+# Pin fpm for compatibility with Ruby < 2.3
+RUN gem install ffi:1.12.2 fpm:1.11.0 && \
+    ln -s /usr/bin/fpm.ruby2.1 /usr/local/bin/fpm
 
 RUN chmod 0777 /opt
 
diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42
index 5bb72c9..27cf45c 100644
--- a/builder/package.opensuse-42
+++ b/builder/package.opensuse-42
@@ -13,7 +13,7 @@ fi
 # create post-install script required for openblas
 cat <<EOF >> /post-install.sh
 mv /opt/R/${R_VERSION}/lib/R/lib/libRblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so.keep
-ln -s /usr/lib64/libopenblas.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so
+ln -s /usr/lib64/libopenblas_pthreads.so /opt/R/${R_VERSION}/lib/R/lib/libRblas.so
 EOF
 
 # create after-remove script to remove internal blas
@@ -53,7 +53,7 @@ fpm \
   -d libpango-1_0-0 \
   -d libtiff5 \
   -d make \
-  -d openblas-devel \
+  -d libopenblas_pthreads-devel \
   -d ${pcre_lib} \
   -d tar \
   -d tcl \