diff --git a/.github/workflows/image-pr.yml b/.github/workflows/image-pr.yml
index 9b7b9ec97b0b..77b11be86e69 100644
--- a/.github/workflows/image-pr.yml
+++ b/.github/workflows/image-pr.yml
@@ -35,60 +35,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - build-type: 'cublas'
-            cuda-major-version: "12"
-            cuda-minor-version: "9"
+          - build-type: ''
+            cuda-major-version: ""
+            cuda-minor-version: ""
             platforms: 'linux/amd64'
             tag-latest: 'false'
-            tag-suffix: '-gpu-nvidia-cuda-12'
+            tag-suffix: ''
             runs-on: 'ubuntu-latest'
             base-image: "ubuntu:24.04"
             makeflags: "--jobs=3 --output-sync=target"
             ubuntu-version: '2404'
-          - build-type: 'cublas'
-            cuda-major-version: "13"
-            cuda-minor-version: "0"
-            platforms: 'linux/amd64'
-            tag-latest: 'false'
-            tag-suffix: '-gpu-nvidia-cuda-13'
-            runs-on: 'ubuntu-latest'
-            base-image: "ubuntu:22.04"
-            makeflags: "--jobs=3 --output-sync=target"
-            ubuntu-version: '2404'
-          - build-type: 'hipblas'
-            platforms: 'linux/amd64'
-            tag-latest: 'false'
-            tag-suffix: '-hipblas'
-            base-image: "rocm/dev-ubuntu-24.04:6.4.4"
-            grpc-base-image: "ubuntu:24.04"
-            runs-on: 'ubuntu-latest'
-            makeflags: "--jobs=3 --output-sync=target"
-            ubuntu-version: '2404'
-          - build-type: 'sycl'
-            platforms: 'linux/amd64'
-            tag-latest: 'false'
-            base-image: "intel/oneapi-basekit:2025.3.0-0-devel-ubuntu24.04"
-            grpc-base-image: "ubuntu:24.04"
-            tag-suffix: 'sycl'
-            runs-on: 'ubuntu-latest'
-            makeflags: "--jobs=3 --output-sync=target"
-            ubuntu-version: '2404'
-          - build-type: 'vulkan'
-            platforms: 'linux/amd64'
-            tag-latest: 'false'
-            tag-suffix: '-vulkan-core'
-            runs-on: 'ubuntu-latest'
-            base-image: "ubuntu:24.04"
-            makeflags: "--jobs=4 --output-sync=target"
-            ubuntu-version: '2404'
-          - build-type: 'cublas'
-            cuda-major-version: "13"
-            cuda-minor-version: "0"
-            platforms: 'linux/arm64'
-            tag-latest: 'false'
-            tag-suffix: '-nvidia-l4t-arm64-cuda-13'
-            base-image: "ubuntu:24.04"
-            runs-on: 'ubuntu-24.04-arm'
-            makeflags: "--jobs=4 --output-sync=target"
-            skip-drivers: 'false'
-            ubuntu-version: '2404'
diff --git a/Dockerfile b/Dockerfile
index 73d6a7b1304f..d3521a74e32f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,28 +14,11 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# GPU drivers are no longer installed in the main image.
-# Each backend now packages its own GPU libraries (CUDA, ROCm, SYCL, Vulkan)
-# This allows for a unified base image that works with any backend.
-FROM requirements AS requirements-drivers
-
-ARG BUILD_TYPE
-ARG CUDA_MAJOR_VERSION=12
-ARG CUDA_MINOR_VERSION=0
-ARG SKIP_DRIVERS=false
-ARG TARGETARCH
-ARG TARGETVARIANT
-ENV BUILD_TYPE=${BUILD_TYPE}
-ARG UBUNTU_VERSION=2404
-
-RUN mkdir -p /run/localai
-RUN echo "default" > /run/localai/capability
-
 ###################################
 ###################################
 
 # The requirements-core target is common to all images.  It should not be placed in requirements-core unless every single build will use it.
-FROM requirements-drivers AS build-requirements
+FROM requirements AS build-requirements
 
 ARG GO_VERSION=1.25.4
 ARG CMAKE_VERSION=3.31.10
@@ -87,8 +70,6 @@ RUN echo "Target Architecture: $TARGETARCH"
 RUN echo "Target Variant: $TARGETVARIANT"
 
 
-
-
 WORKDIR /build
 
 
@@ -209,7 +190,7 @@ RUN go install github.com/mikefarah/yq/v4@latest
 
 # This is the final target. The result of this target will be the image uploaded to the registry.
 # If you cannot find a more suitable place for an addition, this layer is a suitable place for it.
-FROM requirements-drivers
+FROM requirements
 
 ENV HEALTHCHECK_ENDPOINT=http://localhost:8080/readyz