diff --git a/.common-ci.yml b/.common-ci.yml
index 93c575ce..e9ab8ef5 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -210,13 +210,6 @@ release:staging-centos7:
   needs:
     - image-centos7
 
-release:staging-centos8:
-  extends:
-    - .release:staging
-    - .dist-centos8
-  needs:
-    - image-centos8
-
 release:staging-ubi8:
   extends:
     - .release:staging
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9716b97d..919d6588 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -231,16 +231,6 @@ image-centos7:
     - package-centos7-ppc64le
     - package-centos7-x86_64
 
-image-centos8:
-  extends:
-    - .image-build
-    - .package-artifacts
-    - .dist-centos8
-  needs:
-    - package-centos8-aarch64
-    - package-centos8-x86_64
-    - package-centos8-ppc64le
-
 image-ubi8:
   extends:
     - .image-build
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 3f778cdf..d75b0e1e 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -70,11 +70,6 @@ image-centos7:
     - .image-pull
     - .dist-centos7
 
-image-centos8:
-  extends:
-    - .image-pull
-    - .dist-centos8
-
 image-ubi8:
   extends:
     - .image-pull
@@ -154,23 +149,6 @@ scan-centos7-arm64:
     - image-centos7
     - scan-centos7-amd64
 
-scan-centos8-amd64:
-  extends:
-    - .scan
-    - .dist-centos8
-    - .platform-amd64
-  needs:
-    - image-centos8
-
-scan-centos8-arm64:
-  extends:
-    - .scan
-    - .dist-centos8
-    - .platform-arm64
-  needs:
-    - image-centos8
-    - scan-centos8-amd64
-
 scan-ubuntu18.04-amd64:
   extends:
     - .scan
@@ -179,15 +157,6 @@ scan-ubuntu18.04-amd64:
   needs:
     - image-ubuntu18.04
 
-scan-ubuntu18.04-arm64:
-  extends:
-    - .scan
-    - .dist-ubuntu18.04
-    - .platform-arm64
-  needs:
-    - image-ubuntu18.04
-    - scan-ubuntu18.04-amd64
-
 scan-ubuntu20.04-amd64:
   extends:
     - .scan
@@ -253,11 +222,6 @@ release:ngc-centos7:
     - .release:ngc
     - .dist-centos7
 
-release:ngc-centos8:
-  extends:
-    - .release:ngc
-    - .dist-centos8
-
 release:ngc-ubuntu18.04:
   extends:
     - .release:ngc
diff --git a/build/container/Makefile b/build/container/Makefile
index 7a1186e7..d69b1b69 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -43,8 +43,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DEFAULT_PUSH_TARGET := ubuntu18.04
-DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8
+DEFAULT_PUSH_TARGET := ubuntu20.04
+DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7
 
 META_TARGETS := packaging
 
@@ -110,10 +110,10 @@ build-ubi8: DOCKERFILE_SUFFIX := centos
 build-ubi8: PACKAGE_DIST = centos8
 build-ubi8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1)
 
-build-centos%: BASE_DIST = $(*)
-build-centos%: DOCKERFILE_SUFFIX := centos
-build-centos%: PACKAGE_DIST = $(BASE_DIST)
-build-centos%: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1)
+build-centos7: BASE_DIST = $(*)
+build-centos7: DOCKERFILE_SUFFIX := centos
+build-centos7: PACKAGE_DIST = $(BASE_DIST)
+build-centos7: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1)
 
 build-packaging: BASE_DIST := ubuntu20.04
 build-packaging: DOCKERFILE_SUFFIX := packaging
diff --git a/build/container/multi-arch.mk b/build/container/multi-arch.mk
index 94a3527c..445ea0d0 100644
--- a/build/container/multi-arch.mk
+++ b/build/container/multi-arch.mk
@@ -30,5 +30,8 @@ push-short:
 # We only have x86_64 packages for centos7
 build-centos7: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
 
+# We only generate amd64 image for ubuntu18.04
+build-ubuntu18.04: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
+
 # We only generate a single image for packaging targets
 build-packaging: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
diff --git a/versions.mk b/versions.mk
index 3af4c12d..8672062a 100644
--- a/versions.mk
+++ b/versions.mk
@@ -24,7 +24,7 @@ NVIDIA_CONTAINER_RUNTIME_VERSION := 3.10.0
 # Specify the expected libnvidia-container0 version for arm64-based ubuntu builds.
 LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack
 
-CUDA_VERSION := 11.6.0
+CUDA_VERSION := 11.7.0
 GOLANG_VERSION := 1.17.8
 
 GIT_COMMIT ?= $(shell git describe --dirty --long --always 2> /dev/null || echo "")