diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index c53b40e71..f62a19bda 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -2046,7 +2046,7 @@ class Build {
                                 if (isPodman == 0) {
                                     // Note: --userns was introduced in podman 4.3.0
                                     // Add uid and gid userns mapping required for podman
-                                    dockerRunArg += " --userns keep-id:uid=1000,gid=1000"
+                                    dockerRunArg += " --userns keep-id:uid=1002,gid=1003"
                                 }
                                 context.docker.image(buildConfig.DOCKER_IMAGE).inside(buildConfig.DOCKER_ARGS+" "+dockerRunArg) {
                                     buildScripts(
diff --git a/pipelines/build/dockerFiles/cuda.dockerfile b/pipelines/build/dockerFiles/cuda.dockerfile
index ae07c99a8..1f4e4e27b 100644
--- a/pipelines/build/dockerFiles/cuda.dockerfile
+++ b/pipelines/build/dockerFiles/cuda.dockerfile
@@ -1,10 +1,14 @@
 ARG image
+ARG cuda_ver=12.2.0
+ARG cuda_distro=ubuntu20.04
 
+FROM nvidia/cuda:${cuda_ver}-devel-${cuda_distro} as cuda
 FROM $image
 
 # Install cuda headers https://github.com/eclipse/openj9/blob/master/buildenv/docker/mkdocker.sh#L586-L593
-RUN mkdir -p /usr/local/cuda-9.0/nvvm
-COPY --from=nvidia/cuda:9.0-devel-ubuntu16.04 /usr/local/cuda-9.0/include /usr/local/cuda-9.0/include
-COPY --from=nvidia/cuda:9.0-devel-ubuntu16.04 /usr/local/cuda-9.0/nvvm/include /usr/local/cuda-9.0/nvvm/include
+RUN mkdir -p /usr/local/cuda/nvvm
+# TEMP: Copy the header files from the local compile box to the container.
+COPY --from=cuda /usr/local/cuda/include         /usr/local/cuda/include
+COPY --from=cuda /usr/local/cuda/nvvm/include    /usr/local/cuda/nvvm/include
 
-ENV CUDA_HOME="/usr/local/cuda-9.0"
\ No newline at end of file
+ENV CUDA_HOME="/usr/local/cuda"
\ No newline at end of file