diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index 333b0011..00000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Driver Manager Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-
----
-
-_The template below is mostly useful for bug reports and support questions. Feel free to remove anything which doesn't apply to you and add more information where it makes sense._
-
-_**Important Note:  NVIDIA AI Enterprise customers can get support from NVIDIA Enterprise support. Please open a case [here](https://enterprise-support.nvidia.com/s/create-case)**._
-
-
-### 1. Quick Debug Information
-* OS/Version(e.g. RHEL8.6, Ubuntu22.04):
-* Kernel Version:
-* Container Runtime Type/Version(e.g. Containerd, CRI-O, Docker):
-* K8s Flavor/Version(e.g. K8s, OCP, Rancher, GKE, EKS):
-
-### 2. Issue or feature description
-_Briefly explain the issue in terms of expected behavior and current behavior._
-
-### 3. Information to [attach](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/) (optional if deemed irrelevant)
-
-Common error checking:
- - [ ] The output of `nvidia-smi -a` on your host
- - [ ] Your docker configuration file (e.g: `/etc/docker/daemon.json`)
- - [ ] The k8s-device-plugin container logs
- - [ ] The kubelet logs on the node (e.g: `sudo journalctl -r -u kubelet`)
-
-Additional information that might help better understand your environment and reproduce the bug:
- - [ ] Docker version from `docker version`
- - [ ] Docker command, image and tag used
- - [ ] Kernel version from `uname -a`
- - [ ] Any relevant kernel output lines from `dmesg`
- - [ ] NVIDIA packages version from `dpkg -l '*nvidia*'` _or_ `rpm -qa '*nvidia*'`
- - [ ] NVIDIA container library version from `nvidia-container-cli -V`
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
index b218c432..7cc236ca 100644
--- a/.github/workflows/images.yaml
+++ b/.github/workflows/images.yaml
@@ -30,10 +30,6 @@ on:
 
 jobs:
   build-image:
-    # We trigger image builds on push events (MERGED pull requests) or on non-closed PRs that are not created against a fork.
-    if: |
-      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
-      (github.event_name == 'push')
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -61,9 +57,10 @@ jobs:
           echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
           echo "BUILD_MULTI_ARCH_IMAGES=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
diff --git a/Makefile b/Makefile
index 08f7d925..e4deb1ef 100644
--- a/Makefile
+++ b/Makefile
@@ -77,4 +77,4 @@ PHONY: .shell
 		-v $(PWD):/work \
 		-w /work \
 		--user $$(id -u):$$(id -g) \
-		$(BUILDIMAGE)
\ No newline at end of file
+		$(BUILDIMAGE)
diff --git a/deployments/container/Dockerfile.ubi8 b/deployments/container/Dockerfile.ubi8
index a99d1fc4..fc5e3ebd 100644
--- a/deployments/container/Dockerfile.ubi8
+++ b/deployments/container/Dockerfile.ubi8
@@ -14,7 +14,7 @@
 
 ARG CUDA_VERSION
 ARG BASE_DIST
-ARG GOLANG_VERSION=1.20.5
+ARG GOLANG_VERSION=x.x.x
 
 FROM golang:${GOLANG_VERSION} AS build
 
diff --git a/deployments/container/Makefile b/deployments/container/Makefile
index 7a3f8641..fa168828 100644
--- a/deployments/container/Makefile
+++ b/deployments/container/Makefile
@@ -81,6 +81,7 @@ $(BUILD_TARGETS): build-%:
 			$(DOCKER_BUILD_PLATFORM_OPTIONS) \
 			--tag $(IMAGE) \
 			--build-arg BASE_DIST="$(DIST)" \
+			--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 			--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
 			--build-arg VERSION="$(VERSION)" \
 			--build-arg CVE_UPDATES="$(CVE_UPDATES)" \
diff --git a/versions.mk b/versions.mk
index e3af9337..e4520e0c 100644
--- a/versions.mk
+++ b/versions.mk
@@ -18,7 +18,7 @@ MODULE := github.com/NVIDIA/k8s-driver-manager
 vVERSION := v$(VERSION:v%=%)
 
 CUDA_VERSION := 12.3.0
-GOLANG_VERSION ?= 1.20.5
+GOLANG_VERSION ?= 1.20.4
 
 BUILDIMAGE_TAG ?= devel-go$(GOLANG_VERSION)
-BUILDIMAGE ?=  ghcr.io/nvidia/k8s-test-infra:$(BUILDIMAGE_TAG)
\ No newline at end of file
+BUILDIMAGE ?=  ghcr.io/nvidia/k8s-test-infra:$(BUILDIMAGE_TAG)