diff --git a/docker/build-and-push-images.sh b/docker/build-and-push-images.sh
index 721f40cb7..bc25dfad3 100755
--- a/docker/build-and-push-images.sh
+++ b/docker/build-and-push-images.sh
@@ -221,6 +221,12 @@ args_toolchain()
 			return 0
 			;;
 		clang*)
+			if test "$_epoch" -ge 15; then
+				extra="mesa-opencl-icd"
+				extra="${extra} ocl-icd-opencl-dev"
+				extra="${extra} libclc-${_epoch}-dev"
+				args="$args --build-arg extra_packages=\"${extra}\""
+			fi
 			extra_dev="clang-${_epoch}"
 			extra_dev="${extra_dev} llvm-${_epoch}"
 			extra_dev="${extra_dev} llvm-spirv-${_epoch}"
diff --git a/docker/ubuntu/full/Dockerfile b/docker/ubuntu/full/Dockerfile
index e8e9be169..ecd36b30f 100644
--- a/docker/ubuntu/full/Dockerfile
+++ b/docker/ubuntu/full/Dockerfile
@@ -6,11 +6,12 @@ ARG machine
 
 FROM ${acct}/${repo}:${dist_name}-${dist_version}-base-${machine}
 
+ARG extra_packages
+
 ENV packages="\
 libgraphicsmagick-q16-3 \
 libpng16-16 \
-mesa-opencl-icd \
-ocl-icd-opencl-dev \
+${extra_packages} \
 "
 
 ENV packages_dev="\