diff --git a/docker/Dockerfile-redhat-8 b/docker/Dockerfile-redhat-8
index 15e83bd..92cd133 100644
--- a/docker/Dockerfile-redhat-8
+++ b/docker/Dockerfile-redhat-8
@@ -14,7 +14,7 @@ ENV PGPASS=""
 
 ARG GITHUB_PAT
 
-RUN subscription-manager register --username mail@devxy.io --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-8-aarch64-rpms
+RUN subscription-manager register --username mail@devxy.io --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms
 RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf install -y epel-release
 # xvfb: for graphical pkgs requiring tcl, like gWidgets2tcltk
 # ImageMagick-c++-devel ImageMagick-devel: boths are not auto-installed via pak sysreqs
@@ -26,8 +26,8 @@ RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi
 RUN curl -q -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure --enable-silent-rules && make 2>&1 >/dev/null && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd ..
 
 ### INSTALL R
-RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/el8/R-${R_VERSION}-1-1.aarch64.rpm"
-RUN dnf install -q -y "R-${R_VERSION}-1-1.aarch64.rpm" && rm "R-${R_VERSION}-1-1.aarch64.rpm"
+RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/el8/R-${R_VERSION}-1-1.$(arch).rpm"
+RUN dnf install -q -y "R-${R_VERSION}-1-1.$(arch).rpm" && rm "R-${R_VERSION}-1-1.$(arch).rpm"
 RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'
 
 # Makevars
diff --git a/docker/Dockerfile-redhat-9 b/docker/Dockerfile-redhat-9
index e4012c2..d3437a4 100644
--- a/docker/Dockerfile-redhat-9
+++ b/docker/Dockerfile-redhat-9
@@ -14,7 +14,7 @@ ENV PGPASS=""
 
 ARG GITHUB_PAT
 
-RUN subscription-manager register --username mail@devxy.io --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-9-aarch64-rpms
+RUN subscription-manager register --username mail@devxy.io --password "$RED_HAT_DEV_PW" && subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms
 RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && dnf install -y epel-release
 # xvfb: for graphical pkgs requiring tcl, like gWidgets2tcltk
 # ImageMagick-c++-devel ImageMagick-devel: boths are not auto-installed via pak sysreqs
@@ -26,8 +26,8 @@ RUN dnf install -y -q make lapack-devel git gcc gcc-c++ fontconfig-devel fribidi
 RUN curl -q -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure --enable-silent-rules && make 2>&1 >/dev/null && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd ..
 
 ### INSTALL R
-RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/el9/R-${R_VERSION}-1-1.aarch64.rpm"
-RUN dnf install -q -y "R-${R_VERSION}-1-1.aarch64.rpm" && rm "R-${R_VERSION}-1-1.aarch64.rpm"
+RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/el9/R-${R_VERSION}-1-1.$(arch).rpm"
+RUN dnf install -q -y "R-${R_VERSION}-1-1.$(arch).rpm" && rm "R-${R_VERSION}-1-1.$(arch).rpm"
 RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'
 
 # Makevars
diff --git a/docker/Dockerfile-ubuntu-2204 b/docker/Dockerfile-ubuntu-2204
index 1500c32..1f35f6c 100644
--- a/docker/Dockerfile-ubuntu-2204
+++ b/docker/Dockerfile-ubuntu-2204
@@ -23,8 +23,8 @@ RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran
 RUN curl -q -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure --enable-silent-rules && make 2>&1 >/dev/null && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd ..
 
 ### INSTALL R
-RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/2204/r-${R_VERSION}_1_arm64.deb"
-RUN gdebi -n -qq "r-${R_VERSION}_1_arm64.deb" && rm "r-${R_VERSION}_1_arm64.deb"
+RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/2204/r-${R_VERSION}_1_$(dpkg --print-architecture).deb"
+RUN gdebi -n -qq "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && rm "r-${R_VERSION}_1_$(dpkg --print-architecture).deb"
 RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'
 
 # Makevars
diff --git a/docker/Dockerfile-ubuntu-2404 b/docker/Dockerfile-ubuntu-2404
index cb53857..645e7fb 100644
--- a/docker/Dockerfile-ubuntu-2404
+++ b/docker/Dockerfile-ubuntu-2404
@@ -23,8 +23,8 @@ RUN apt update && apt install -y --no-install-recommends gdebi-core g++ gfortran
 RUN curl -q -L -O https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Source/JAGS-4.3.2.tar.gz && tar -xzf JAGS-4.3.2.tar.gz && cd JAGS-4.3.2 && ./configure --enable-silent-rules && make 2>&1 >/dev/null && rm -rf JAGS-4.3.2.tar.gz JAGS-4.3.2 && cd ..
 
 ### INSTALL R
-RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/2404/r-${R_VERSION}_1_arm64.deb"
-RUN gdebi -n -qq "r-${R_VERSION}_1_arm64.deb" && rm "r-${R_VERSION}_1_arm64.deb"
+RUN curl -O "https://devxy-r-builds.s3.eu-central-2.amazonaws.com/2404/r-${R_VERSION}_1_$(dpkg --print-architecture).deb"
+RUN gdebi -n -qq "r-${R_VERSION}_1_$(dpkg --print-architecture).deb" && rm "r-${R_VERSION}_1_$(dpkg --print-architecture).deb"
 RUN R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/stable/%s/%s/%s", .Platform$pkgType, R.Version()$os, R.Version()$arch))'
 
 # Makevars