diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 513b377..52a15ce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,11 +8,15 @@ on:
 
 permissions: read-all
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   verify:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Verify dockefiles are up-to-date
       run: |
         cmake .
@@ -22,7 +26,7 @@ jobs:
   rst-lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: |
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
@@ -36,42 +40,42 @@ jobs:
   cdn-intel-pkgs-u22-04:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building CDN demo w/ Intel pkgs
       run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu22.04/intel-gfx/Dockerfile -t intel-media-delivery-cdn .
 
   cdn-native-pkgs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building CDN demo w/ Ubuntu native pkgs
       run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/native/Dockerfile -t intel-media-delivery-cdn .
 
   cdn-selfbuild:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building CDN against selfbuild stack
       run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/selfbuild/Dockerfile -t intel-media-delivery-cdn .
 
   cdn-selfbuild-prodkmd:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building CDN against selfbuild stack
       run: docker build --build-arg SAMPLE=cdn --no-cache --force-rm -f docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile -t intel-media-delivery-cdn .
 
   dkms-u2004:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building DKMS pkgs
       run: docker build --no-cache --force-rm -f docker/ubuntu20.04/dkms/Dockerfile -t dkms .
 
   dkms-u2204:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Building DKMS pkgs
       run: docker build --no-cache --force-rm -f docker/ubuntu22.04/dkms/Dockerfile -t dkms .
 
diff --git a/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile b/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile
index 2ac5b5c..3d99dd6 100644
--- a/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile
+++ b/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile
@@ -191,11 +191,11 @@ RUN apt-get update && \
     cmake \
     make && \
   rm -rf /var/lib/apt/lists/*
-ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-22.6.1.tar.gz
+ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-22.6.1.tar.gz
 RUN cd /opt/build && \
   wget -O - ${ONEVPLGPU_REPO} | tar xz
 # build oneVPL gpu
-RUN cd /opt/build/oneVPL-intel-gpu-intel-onevpl-22.6.1 && \
+RUN cd /opt/build/vpl-gpu-rt-intel-onevpl-22.6.1 && \
     mkdir -p _build && cd _build && \
     cmake \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/docker/ubuntu20.04/selfbuild/Dockerfile b/docker/ubuntu20.04/selfbuild/Dockerfile
index 988de91..fe1c4d9 100644
--- a/docker/ubuntu20.04/selfbuild/Dockerfile
+++ b/docker/ubuntu20.04/selfbuild/Dockerfile
@@ -191,11 +191,11 @@ RUN apt-get update && \
     cmake \
     make && \
   rm -rf /var/lib/apt/lists/*
-ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-22.6.1.tar.gz
+ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-22.6.1.tar.gz
 RUN cd /opt/build && \
   wget -O - ${ONEVPLGPU_REPO} | tar xz
 # build oneVPL gpu
-RUN cd /opt/build/oneVPL-intel-gpu-intel-onevpl-22.6.1 && \
+RUN cd /opt/build/vpl-gpu-rt-intel-onevpl-22.6.1 && \
     mkdir -p _build && cd _build && \
     cmake \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/templates/m4docker/components/onevpl-gpu.m4 b/templates/m4docker/components/onevpl-gpu.m4
index 240227a..1c2d305 100644
--- a/templates/m4docker/components/onevpl-gpu.m4
+++ b/templates/m4docker/components/onevpl-gpu.m4
@@ -40,12 +40,12 @@ define(`ONEVPLGPU_BUILD_DEPS',`ca-certificates gcc g++ wget pkg-config cmake mak
 ')
 
 define(`BUILD_ONEVPLGPU',
-ARG ONEVPLGPU_REPO=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/intel-onevpl-ONEVPL_GPU_VER.tar.gz
+ARG ONEVPLGPU_REPO=https://github.com/intel/vpl-gpu-rt/archive/intel-onevpl-ONEVPL_GPU_VER.tar.gz
 RUN cd BUILD_HOME && \
   wget -O - ${ONEVPLGPU_REPO} | tar xz
-ifdef(`ONEVPLGPU_PATCH_PATH',`PATCH(BUILD_HOME/oneVPL-intel-gpu-intel-onevpl-ONEVPL_GPU_VER,ONEVPLGPU_PATCH_PATH)')dnl
+ifdef(`ONEVPLGPU_PATCH_PATH',`PATCH(BUILD_HOME/vpl-gpu-rt-intel-onevpl-ONEVPL_GPU_VER,ONEVPLGPU_PATCH_PATH)')dnl
 # build oneVPL gpu
-RUN cd BUILD_HOME/oneVPL-intel-gpu-intel-onevpl-ONEVPL_GPU_VER && \
+RUN cd BUILD_HOME/vpl-gpu-rt-intel-onevpl-ONEVPL_GPU_VER && \
     mkdir -p _build && cd _build && \
     cmake \
     -DCMAKE_BUILD_TYPE=Release \