diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index e36e3f01..26ef8192 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -1,5 +1,5 @@
 ARG	REGISTRY=docker.io
-ARG	UPSTREAM_DISTRO=centos:centos8
+ARG	UPSTREAM_DISTRO=almalinux:8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
diff --git a/centos8-build/Makefile b/centos8-build/Makefile
index cba5cee8..a18eb5cf 100644
--- a/centos8-build/Makefile
+++ b/centos8-build/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO:=centos:centos8
+UPSTREAM_DISTRO:=almalinux:8
 DISTRO:=centos8
 include ../make/Makefile
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index 4e180dee..69eeb796 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -1,5 +1,5 @@
 ARG	REGISTRY=docker.io
-ARG	UPSTREAM_DISTRO=centos:centos8
+ARG	UPSTREAM_DISTRO=almalinux:8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
diff --git a/centos8-obs-latest/Makefile b/centos8-obs-latest/Makefile
index cba5cee8..a18eb5cf 100644
--- a/centos8-obs-latest/Makefile
+++ b/centos8-obs-latest/Makefile
@@ -1,3 +1,3 @@
-UPSTREAM_DISTRO:=centos:centos8
+UPSTREAM_DISTRO:=almalinux:8
 DISTRO:=centos8
 include ../make/Makefile
diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile
index 27d7a597..2f1c3454 100644
--- a/centos8-repo-install-test/Dockerfile
+++ b/centos8-repo-install-test/Dockerfile
@@ -1,6 +1,6 @@
 ARG	USER
 ARG	REGISTRY=docker.io
-ARG	UPSTREAM_DISTRO=centos:centos8
+ARG	UPSTREAM_DISTRO=almalinux:8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 
 # dnf-utils: for repoquery
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 1e9435a7..7130fe2f 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -39,9 +39,9 @@ docker_distro_from_image_name() {
 docker_upstream_distro_from_image_name() {
 	case "$1" in
 	osmo-*-centos7) echo "centos:centos7"; ;;
-	osmo-*-centos8) echo "centos:centos8"; ;;
+	osmo-*-centos8) echo "almalinux:8"; ;;
 	centos7-*) echo "centos:centos7" ;;
-	centos8-*) echo "centos:centos8" ;;
+	centos8-*) echo "almalinux:8" ;;
 	debian9-*) echo "debian:stretch" ;;
 	debian10-*) echo "debian:buster" ;;
 	debian11-*) echo "debian:bullseye" ;;
@@ -120,7 +120,7 @@ list_osmo_packages() {
 #	name (e.g. osmo-mgw-master-centos8), it gets removed from the subdir
 #	where the Dockerfile is taken from (e.g. osmo-mgw-master/Dockerfile)
 #	and UPSTREAM_DISTRO and DISTRO are passed accordingly (e.g.
-#	UPSTREAM_DISTRO=centos:centos8 DISTRO=centos8). This allows one
+#	UPSTREAM_DISTRO=almalinux:8 DISTRO=centos8). This allows one
 #	Dockerfile for multiple distributions, without duplicating configs for
 #	each distribution. Dependencies listed in docker_depends() are built
 #	automatically too.
diff --git a/systemd/Dockerfile b/systemd/Dockerfile
index 8f1763de..63d4c40d 100644
--- a/systemd/Dockerfile
+++ b/systemd/Dockerfile
@@ -1,5 +1,5 @@
 ARG	REGISTRY=docker.io
-ARG	UPSTREAM_DISTRO=centos:centos8
+ARG	UPSTREAM_DISTRO=almalinux:8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	DISTRO