diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 9264d0d4163c..6caa9bd9ee7f 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -24,11 +24,15 @@ jobs:
             tag-latest: 'auto'
             tag-suffix: ''
             ffmpeg: ''
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
           - build-type: ''
             platforms: 'linux/amd64'
             tag-latest: 'false'
             tag-suffix: '-ffmpeg'
             ffmpeg: 'true'
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
           - build-type: 'cublas'
             cuda-major-version: 11
             cuda-minor-version: 7
@@ -36,6 +40,8 @@ jobs:
             tag-latest: 'false'
             tag-suffix: '-cublas-cuda11'
             ffmpeg: ''
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
           - build-type: 'cublas'
             cuda-major-version: 12
             cuda-minor-version: 1
@@ -43,6 +49,8 @@ jobs:
             tag-latest: 'false'
             tag-suffix: '-cublas-cuda12'
             ffmpeg: ''
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
           - build-type: 'cublas'
             cuda-major-version: 11
             cuda-minor-version: 7
@@ -50,6 +58,8 @@ jobs:
             tag-latest: 'false'
             tag-suffix: '-cublas-cuda11-ffmpeg'
             ffmpeg: 'true'
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
           - build-type: 'cublas'
             cuda-major-version: 12
             cuda-minor-version: 1
@@ -57,8 +67,61 @@ jobs:
             tag-latest: 'false'
             tag-suffix: '-cublas-cuda12-ffmpeg'
             ffmpeg: 'true'
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
+          - build-type: ''
+            #platforms: 'linux/amd64,linux/arm64'
+            platforms: 'linux/amd64'
+            tag-latest: 'auto'
+            tag-suffix: ''
+            ffmpeg: ''
+            image-type: 'extras'
+            runs-on: 'arc-runner-set'
+          - build-type: ''
+            platforms: 'linux/amd64'
+            tag-latest: 'false'
+            tag-suffix: '-ffmpeg-core'
+            ffmpeg: 'true'
+            image-type: 'core'
+            runs-on: 'ubuntu-latest'
+          - build-type: 'cublas'
+            cuda-major-version: 11
+            cuda-minor-version: 7
+            platforms: 'linux/amd64'
+            tag-latest: 'false'
+            tag-suffix: '-cublas-cuda11-core'
+            ffmpeg: ''
+            image-type: 'core'
+            runs-on: 'ubuntu-latest'
+          - build-type: 'cublas'
+            cuda-major-version: 12
+            cuda-minor-version: 1
+            platforms: 'linux/amd64'
+            tag-latest: 'false'
+            tag-suffix: '-cublas-cuda12-core'
+            ffmpeg: ''
+            image-type: 'core'
+            runs-on: 'ubuntu-latest'
+          - build-type: 'cublas'
+            cuda-major-version: 11
+            cuda-minor-version: 7
+            platforms: 'linux/amd64'
+            tag-latest: 'false'
+            tag-suffix: '-cublas-cuda11-ffmpeg-core'
+            ffmpeg: 'true'
+            image-type: 'core'
+            runs-on: 'ubuntu-latest'
+          - build-type: 'cublas'
+            cuda-major-version: 12
+            cuda-minor-version: 1
+            platforms: 'linux/amd64'
+            tag-latest: 'false'
+            tag-suffix: '-cublas-cuda12-ffmpeg-core'
+            ffmpeg: 'true'
+            image-type: 'core'
+            runs-on: 'ubuntu-latest'
 
-    runs-on: arc-runner-set 
+    runs-on: ${{ matrix.runs-on }}
     steps:
       - name: Force Install GIT latest
         run: |
@@ -145,6 +208,7 @@ jobs:
             CUDA_MAJOR_VERSION=${{ matrix.cuda-major-version }}
             CUDA_MINOR_VERSION=${{ matrix.cuda-minor-version }}
             FFMPEG=${{ matrix.ffmpeg }}
+            IMAGE_TYPE=${{ matrix.image-type }}
           context: .
           file: ./Dockerfile
           platforms: ${{ matrix.platforms }}
