diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 67b7010d0..a51aa3624 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,7 +19,6 @@ on:
     branches:
       - "pull-request/[0-9]+"
       - main
-      - ARM_Runner
       - release-*
 
 jobs:
@@ -134,7 +133,6 @@ jobs:
           echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV
 
           GENERATE_ARTIFACTS="false"
-          #NOT_USING_ARM="false"
           if [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then
             GENERATE_ARTIFACTS="false"
           elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
@@ -294,8 +292,6 @@ jobs:
           echo "${VERSION}"
           make build-${{ matrix.dist }}
 
-
-  ### MULTI-ARCH-IMAGES test ###
   build-multi-arch-image:
     needs: [build-gpu-operator-arm, build-gpu-operator-validator-arm, build-gpu-operator-amd, build-gpu-operator-validator-amd]
     runs-on: ubuntu-latest
@@ -313,8 +309,6 @@ jobs:
           REPO_FULL_NAME="${{ github.event.pull_request.head.repo.full_name }}"
           echo "${REPO_FULL_NAME}"
           echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -323,8 +317,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build Manifest
         env:
-          LOWERCASE_REPO_OWNER: ${{ env.LOWERCASE_REPO_OWNER }}
-          COMMIT_SHORT_SHA: ${{ env.COMMIT_SHORT_SHA }}
           IMAGE_ID_ARM: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-arm
           IMAGE_ID_AMD: ghcr.io/${{ env.LOWERCASE_REPO_OWNER}}/gpu-operator:${{ env.COMMIT_SHORT_SHA }}-amd
           IMAGE_ID_ARM_VAL: ghcr.io/${{ env.LOWERCASE_REPO_OWNER }}/gpu-operator/gpu-operator-validator:${{ env.COMMIT_SHORT_SHA }}-arm
diff --git a/Makefile b/Makefile
index 555f2160d..b8ad3f3b5 100644
--- a/Makefile
+++ b/Makefile
@@ -256,8 +256,6 @@ coverage: unit-test
 	cat $(COVERAGE_FILE) | grep -v "_mock.go" > $(COVERAGE_FILE).no-mocks
 	go tool cover -func=$(COVERAGE_FILE).no-mocks
 
-
-
 ##### Public rules #####
 DISTRIBUTIONS := ubi9
 DEFAULT_PUSH_TARGET := ubi9