diff --git a/.github/workflows/build_test_lin.yml b/.github/workflows/build_test_lin.yml
index c8c19b59..f0b4a637 100644
--- a/.github/workflows/build_test_lin.yml
+++ b/.github/workflows/build_test_lin.yml
@@ -12,7 +12,7 @@ on:
         required: true
         default: 'dev'
       os:
-        description: 'OS for Docker image: ubuntu20'
+        description: 'OS for Docker image: ubuntu24'
         required: true
         default: 'ubuntu24'
       args:
diff --git a/.github/workflows/build_test_win.yml b/.github/workflows/build_test_win.yml
deleted file mode 100644
index bb773f74..00000000
--- a/.github/workflows/build_test_win.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Image build/test on Windows
-
-on:
-  workflow_dispatch:
-    inputs:
-      package_url:
-        description: 'URL to OpenVINO package'
-        required: true
-        default: ''
-      distribution:
-        description: 'Distribution of OpenVINO package: dev, runtime'
-        required: true
-        default: 'dev'
-      os:
-        description: 'OS for Docker image: winserver2019'
-        required: true
-        default: 'winserver2019'
-      args:
-        description: 'Additional arguments'
-        required: false
-        default: ''
-
-permissions: read-all
-
-jobs:
-  build_test_win:
-    runs-on: windows-2019
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v2
-      - name: Setting up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.12'
-      - name: Setting up Python dependencies
-        run: python -m pip install -r requirements.txt
-      - name: Build and test image
-        run: python docker_openvino.py build_test --dist ${{ github.event.inputs.distribution }} --msbuild msbuild2019_online -os ${{ github.event.inputs.os }} --package_url ${{ github.event.inputs.package_url }} -k cpu ${{ github.event.inputs.args }}
-      - name: Checking resulting image
-        if: ${{ always() }}
-        run: docker images
-      - name: Collecting artifacts
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs
-          path: |
-            logs/
-            ./*.html
-            ./*.log
\ No newline at end of file
diff --git a/.github/workflows/images_build_check.yml b/.github/workflows/images_build_check.yml
index b9e02345..764d0e91 100644
--- a/.github/workflows/images_build_check.yml
+++ b/.github/workflows/images_build_check.yml
@@ -16,15 +16,6 @@ jobs:
         os: [ubuntu-24.04]
         image_os: [ubuntu24]
         image_distribution: [runtime]
-        exclude:
-          - os: ubuntu-24.04
-            image_os: winserver2019
-          - os: windows-2019
-            image_os: centos7
-          - os: windows-2019
-            image_os: ubuntu24
-          - os: windows-2019
-            image_os: ubuntu24
     runs-on: ${{ matrix.os }}
     steps:
       - name: Code checkout
@@ -39,9 +30,6 @@ jobs:
       - name: Build Linux image (runtime, latest release)
         if: ${{ matrix.os == 'ubuntu-24.04' && ! startsWith(matrix.image_os, 'win') }}
         run: python docker_openvino.py build --dist ${{ matrix.image_distribution }} -d cpu -d gpu -os ${{ matrix.image_os }}
-      - name: Build Windows image (runtime, latest release)
-        if: ${{ matrix.os == 'windows-2019' && startsWith(matrix.image_os, 'win') }}
-        run: python docker_openvino.py build --dist ${{ matrix.image_distribution }} -os ${{ matrix.image_os }}
       - name: Checking resulting image
         if: ${{ always() }}
         run: docker images
diff --git a/.github/workflows/manual_publish.yml b/.github/workflows/manual_publish.yml
deleted file mode 100644
index 340fa827..00000000
--- a/.github/workflows/manual_publish.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: Image publishing
-
-on:
-  workflow_dispatch:
-    inputs:
-      package_url:
-        description: 'URL to OpenVINO package'
-        required: true
-        default: ''
-      distribution:
-        description: 'Distribution of OpenVINO package: dev, runtime'
-        required: true
-        default: 'dev'
-      os:
-        description: 'OS for Docker image: ubuntu20, winserver2019, windows20h2'
-        required: true
-        default: ''
-      host_os:
-        description: 'OS for Host machine: ubuntu-20.04, windows-docker'
-        required: true
-        default: ''
-      tags:
-        description: 'Tags, ex. -t image_name:YYYY.U -t image_name:YYYY.U_src -t image_name:latest'
-        required: true
-        default: ''
-      args:
-        description: 'Additional arguments, ex. --build_arg no_samples=True --build_arg INSTALL_SOURCES=yes'
-        required: false
-        default: ''
-
-permissions: read-all
-
-jobs:
-  manual_publish:
-    strategy:
-      matrix:
-        os: [ ubuntu-24.04, windows-docker ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v2
-      - name: Setting up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-      - name: Setting up Python dependencies
-        if: ${{ matrix.os == github.event.inputs.host_os }}
-        run: python -m pip install -r requirements.txt
-      - name: Docker login to registry (Linux)
-        if: ${{ matrix.os == 'ubuntu-20.04' }}
-        run: echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Docker login to registry (Windows)
-        if: ${{ matrix.os == 'windows-docker' }}
-        run: echo $Env:DOCKER_PASSWORD | docker login --username $Env:DOCKER_USERNAME --password-stdin
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and publish image on DockerHub
-        if: ${{ matrix.os == github.event.inputs.host_os }}
-        run: python docker_openvino.py all --dist ${{ github.event.inputs.distribution }} -os ${{ github.event.inputs.os }} --package_url ${{ github.event.inputs.package_url }} --nightly -r openvino ${{ github.event.inputs.tags }} ${{ github.event.inputs.args }}
-      - name: Docker logout
-        run: docker logout
-      - name: Docker login to Azure registry (Linux)
-        if: ${{ matrix.os == 'ubuntu-20.04' && contains(github.event.inputs.os, 'ubuntu') }}
-        run: echo $AZURE_PASSWORD | docker login --username $AZURE_USERNAME --password-stdin openvino.azurecr.io
-        env:
-          AZURE_USERNAME: ${{ secrets.AZURE_USERNAME }}
-          AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
-      - name: Docker login to Azure registry (Windows)
-        if: ${{ matrix.os == 'windows-docker' && contains(github.event.inputs.os, 'win') }}
-        run: echo $Env:AZURE_PASSWORD | docker login --username $Env:AZURE_USERNAME --password-stdin openvino.azurecr.io
-        env:
-          AZURE_USERNAME: ${{ secrets.AZURE_USERNAME }}
-          AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
-      - name: Publish image on Azure
-        if: ${{ matrix.os == github.event.inputs.host_os }}
-        run: python docker_openvino.py deploy -r openvino.azurecr.io ${{ github.event.inputs.tags }}
-      - name: Docker logout Azure
-        run: docker logout openvino.azurecr.io
-      - name: Collecting artifacts
-        if: ${{ matrix.os == github.event.inputs.host_os }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs
-          path: |
-            logs/
-            ./*.html
-            ./*.log
diff --git a/.github/workflows/update_dockerfiles.yml b/.github/workflows/update_dockerfiles.yml
deleted file mode 100644
index 584ada31..00000000
--- a/.github/workflows/update_dockerfiles.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Update dockerfiles
-
-on:
-  workflow_dispatch:
-    inputs:
-      product_version:
-        description: 'OpenVINO version (example: 2021.4)'
-        required: true
-        default: ''
-
-permissions: read-all
-
-jobs:
-  update_dockerfiles:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v2
-      - name: Setting up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-      - name: Setting up Python dependencies
-        run: python -m pip install -r requirements.txt
-      - name: Generate dockerfiles for release
-        shell: bash
-        run: |
-          declare -A IMAGES=( ['ubuntu20']='runtime dev'
-                              ['rhel8']='runtime dev'
-                              ['winserver2019']='runtime dev'
-                              ['windows20h2']='runtime dev' )
-          for image_os in "${!IMAGES[@]}"
-          do
-            for distr in ${IMAGES[$image_os]}
-            do
-              if [[ "$image_os" == win* ]]
-              then
-                if [[ "$distr" != "runtime" ]]
-                then
-                  python docker_openvino.py gen_dockerfile -os "$image_os" -dist "$distr" -p ${{ github.event.inputs.product_version }} --pre_stage_msbuild=msbuild2019_online --msbuild msbuild2019_online
-                else
-                  python docker_openvino.py gen_dockerfile -os "$image_os" -dist "$distr" -p ${{ github.event.inputs.product_version }} --pre_stage_msbuild=msbuild2019_online
-                fi
-              else
-                python docker_openvino.py gen_dockerfile -os "$image_os" -dist "$distr" -p ${{ github.event.inputs.product_version }}
-              fi
-              if [ "$image_os" == "rhel8" ]
-              then
-                python docker_openvino.py gen_dockerfile -os "$image_os" -dist "$distr" -p ${{ github.event.inputs.product_version }} --rhel_platform=openshift
-              fi
-            done
-          done
-      - name: Create Pull Request
-        id: create_pr
-        uses: peter-evans/create-pull-request@f22a7da129c901513876a2380e2dae9f8e145330
-        with:
-          token: ${{ secrets.CREATE_PR_USER_TOKEN }}
-          commit-message: Update dockerfiles for ${{ github.event.inputs.product_version }} release
-          title: Update dockerfiles for ${{ github.event.inputs.product_version }} release
-          body: Automated dockerfiles update
-          branch: update-dockerfiles-${{ github.event.inputs.product_version }}
-          delete-branch: true
-      - name: Show Pull Request info
-        run: |
-          echo "Pull Request Number - ${{ steps.create_pr.outputs.pull-request-number }}"
-          echo "Pull Request URL - ${{ steps.create_pr.outputs.pull-request-url }}"
-          echo "Pull Request Operation - ${{ steps.create_pr.outputs.pull-request-operation }}"
-      - name: Collecting artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs
-          path: |
-            logs/
-            dockerfiles/
-            ./*.html
-            ./*.log
diff --git a/docker_openvino.py b/docker_openvino.py
index 80a1f381..6539e58a 100755
--- a/docker_openvino.py
+++ b/docker_openvino.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Main script of this framework, putting all the logic together"""
 import argparse
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
deleted file mode 100644
index b069ddd8..00000000
--- a/dockerfiles/README.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Dockerfiles with [Intel® Distribution of OpenVINO™ toolkit](https://github.com/openvinotoolkit/openvino)
-
-This repository folder contains Dockerfiles to build an docker image with the Intel® Distribution of OpenVINO™ toolkit.
-You can use Docker CI framework to build an image, please follow [Get Started with DockerHub CI for Intel® Distribution of OpenVINO™ toolkit](../get-started.md).
-
-1. [Supported Operating Systems for Docker image](#supported-operating-systems-for-docker-image)  
-2. [Supported devices and distributions](#supported-devices-and-distributions)  
-3. [Where to get OpenVINO package](#where-to-get-openvino-package)
-4. [How to build](#how-to-build)  
-5. [Prebuilt images](#prebuilt-images)  
-6. [How to run a container](#how-to-run-a-container)  
-
-## Supported Operating Systems for Docker image
-
- - `ubuntu18` folder (Ubuntu* 18.04 LTS)
- - `ubuntu20` folder (Ubuntu* 20.04 LTS)
- - `rhel8` folder (RHEL* 8)
- - `winserver2019` folder (Windows* Server Core base OS LTSC 2019)
- - `windows20h2` folder (Windows* OS 20H2)
-
-*Note*: `dl-workbench` folder contains Dockerfiles for OpenVINO™ Deep Learning Workbench.
-
-## Supported devices and distributions
-
-![OpenVINO Dockerfile Name](../docs/img/dockerfile_name.png)
-
- **Devices:**
- - CPU
- - GPU
- - VPU (NCS2)
- - HDDL (VPU HDDL) (_Prerequisite_: run HDDL daemon on the host machine, follow the [configuration guide for HDDL device](../install_guide_vpu_hddl.md))
-
- OpenVINO documentation for [supported devices](https://docs.openvino.ai/latest/openvino_docs_IE_DG_supported_plugins_Supported_Devices.html).
-
- **Distributions:**
-
- - **runtime**: IE core, nGraph, plugins
- - **dev**: IE core, nGraph, plugins, samples, Python dev tools: Model Optimizer, Post training Optimization tool, Accuracy checker, Open Model Zoo tools (downloader, converter), OpenCV
- - **base** (only for CPU): IE core, nGraph
-
-You can generate Dockerfile with your settings, please follow the [DockerHub CI documentation](../get-started.md).
- * _runtime_ and _dev_ distributions are based on archive package of OpenVINO product. You can just remove unnecessary parts.
- * _base_ distribution is created by [OpenVINO™ Deployment Manager](https://docs.openvino.ai/latest/openvino_docs_install_guides_deployment_manager_tool.html).
-
-## Where to get OpenVINO package
-
-You can get OpenVINO distribution packages (runtime, dev) directly from [public storage](https://storage.openvinotoolkit.org/repositories/openvino/packages/).
-For example: 
-* take 2022.2 > linux > ubuntu20 `l_openvino_toolkit_ubuntu20_2022.2.0.7713.af16ea1d79a_x86_64.tgz` package.
-
-## How to build
-
-**Note:** Please use Docker CI framework release version corresponding to the version of OpenVINO™ Toolkit that you need to build.
-
-* Base image with CPU only:
-
-You can use Docker CI framework to build an image, please follow [Get Started with DockerHub CI for Intel® Distribution of OpenVINO™ toolkit](../get-started.md).
-
-```bash
-python3 docker_openvino.py build --file "dockerfiles/ubuntu18/openvino_c_base_2022.2.0.dockerfile" -os ubuntu18 -dist base -p 2022.2.0
-```
-
-----------------
-
-* Dev/runtime image:
-
-You can use Docker CI framework to build an image, please follow [Get Started with DockerHub CI for Intel® Distribution of OpenVINO™ toolkit](../get-started.md).
-
-```bash
-python3 docker_openvino.py build --file "dockerfiles/ubuntu18/openvino_cgvh_dev_2022.2.0.dockerfile" -os ubuntu18 -dist dev -p 2022.2.0
-```
-For runtime distribution, please set appropriate `-dist` and `--file` options.
-
-Or via Docker Engine directly, but you need specify `package_url` argument (see [Where to get OpenVINO package section](#where-to-get-openvino-package)):
-```bash
-docker build --build-arg package_url=https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/linux/l_openvino_toolkit_ubuntu18_2022.2.0.7713.af16ea1d79a_x86_64.tgz \
--t ubuntu18_dev:2022.2.0 -f dockerfiles/ubuntu18/openvino_cgvh_dev_2022.2.0.dockerfile .
-```
-----------------
-
-* Custom image with CPU, iGPU, VPU support  
-You can use Dockerfiles from the `build_custom` folders to build a custom version of OpenVINO™ from source code for development. To learn more, follow:
-  * [Build custom Intel® Distribution of OpenVINO™ toolkit Docker image on Ubuntu 18](ubuntu18/build_custom/README.md)
-  * [Build custom Intel® Distribution of OpenVINO™ toolkit Docker image on Ubuntu 20](ubuntu20/build_custom/README.md)
-
-## Prebuilt images
-
-Prebuilt images are available on: 
-- [Docker Hub](https://hub.docker.com/u/openvino)
-- [Red Hat* Quay.io](https://quay.io/organization/openvino)
-- [Red Hat* Ecosystem Catalog (runtime image)](https://catalog.redhat.com/software/containers/intel/openvino-runtime/606ff4d7ecb5241699188fb3)
-- [Red Hat* Ecosystem Catalog (development image)](https://catalog.redhat.com/software/containers/intel/openvino-dev/613a450dc9bc35f21dc4a1f7)
-- [Azure* Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/intel_corporation.openvino)
-
-
-## How to run a container
-
-Please follow [Run a container](../get-started.md#run-a-container) section in DockerHub CI getting started guide.
-
-## Documentation
-
-* [Install Intel® Distribution of OpenVINO™ toolkit for Linux* from a Docker* Image](https://docs.openvino.ai/latest/openvino_docs_install_guides_installing_openvino_docker_linux.html)
-* [Install Intel® Distribution of OpenVINO™ toolkit for Windows* from Docker* Image](https://docs.openvino.ai/latest/openvino_docs_install_guides_installing_openvino_docker_windows.html)
-* [Official Dockerfile reference](https://docs.docker.com/engine/reference/builder/)
-
----
-\* Other names and brands may be claimed as the property of others.
diff --git a/dockerfiles/rhel8/autobuild/README.md b/dockerfiles/rhel8/autobuild/README.md
deleted file mode 100644
index 322c19ea..00000000
--- a/dockerfiles/rhel8/autobuild/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Intel® Distribution of OpenVINO™ toolkit Docker image using Red Hat® portal Build System
-
-This repository folder contains Dockerfiles with the Intel® Distribution of OpenVINO™ toolkit for automation building via Red Hat* portal Build System.
-
-## Prebuilt images
-
-Prebuilt images are available on [Red Hat* Quay.io](https://quay.io/organization/openvino) and [Red Hat* Ecosystem Catalog](https://catalog.redhat.com/software/containers/intel/openvino-runtime/606ff4d7ecb5241699188fb3) Registries.
-
----
-\* Other names and brands may be claimed as the property of others.
diff --git a/dockerfiles/rhel8/openshift/README.md b/dockerfiles/rhel8/openshift/README.md
deleted file mode 100644
index abce019a..00000000
--- a/dockerfiles/rhel8/openshift/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Build Intel® Distribution of OpenVINO™ toolkit Docker image using Red Hat® OpenShift® Container Platform 
-
-This repository folder contains Dockerfile to build an image with the Intel® Distribution of OpenVINO™ toolkit using Red Hat® OpenShift® Container Platform.
-
-## Prebuilt images
-
-Prebuilt images are available on [Red Hat* Quay.io](https://quay.io/organization/openvino) and [Red Hat* Ecosystem Catalog](https://catalog.redhat.com/software/containers/intel/openvino-runtime/606ff4d7ecb5241699188fb3) Registries.
-
-## Prerequisites
-
-You need Red Hat Enterprise Linux 8 host with installed [Openshift Container Platform 4](https://docs.openshift.com/container-platform/4.6/welcome/index.html).  
->**Note**: 
-> You can use [Red Hat® CodeReady Containers](https://cloud.redhat.com/openshift/create/local) to create a minimal single node cluster for development and testing on a local PC.
-> Read more [here](https://access.redhat.com/documentation/en-us/red_hat_codeready_containers/1.23/).
-
-## How to build
-
-### Configure host
-1. Create a new folder and place the following files in it:
-    * Dockerfile
-    * OpenVINO package (please read [Where to get OpenVINO package](../../README.md#where-to-get-openvino-package) section in the dockerfiles readme.)
-    * `rhsm.conf` (you can take it from `/etc/rhsm/` folder)
-    * `redhat-uep.pem` (you can take it from `/etc/rhsm/ca` folder)
-    * RedHat subscription certificate of your node (you can download it from Red Hat Customer Portal)
-
-
-2. Create a build secret with your Red Hat® subscription certificate:
-```shell
-oc create secret generic entitlement --from-file=entitlement.pem=<your-certificate>.pem --from-file=entitlement-key.pem=<your-certificate>.pem
-```
-3. Create build configmaps with Red Hat® subscription manager configuration:
-```shell
-oc create configmap rhsm-conf --from-file rhsm.conf
-oc create configmap rhsm-ca --from-file redhat-uep.pem
-```
-### Create build configuration
-```shell
- cat openvino_cg_openshift_runtime_2021.3.dockerfile | oc new-build --name <build-name> --dockerfile='-' --build-secret entitlement \
-                                                          --build-config-map rhsm-conf:rhsm-conf --build-config-map rhsm-ca:rhsm-ca \
-                                                          --build-arg package_url=<openvino-tgz-package-name>
-```
-
->**Note**:  
-> Read specified RedHat documentation pages for more info:
-> * [Using Red Hat subscriptions in builds](https://docs.openshift.com/container-platform/4.6/builds/running-entitled-builds.html)
-> * [How to use entitled image builds to build DriverContainers with UBI on OpenShift](https://www.openshift.com/blog/how-to-use-entitled-image-builds-to-build-drivercontainers-with-ubi-on-openshift)
-> * [How to use entitled image builds on Red Hat OpenShift Container Platform 4.x cluster ?](https://access.redhat.com/solutions/4908771)
-
-### Start build
-```shell
-oc start-build <build-name> --from-file <openvino-tgz-package-name> --no-cache=true --follow 
-```
----
-\* Other names and brands may be claimed as the property of others.
diff --git a/dockerfiles/rhel8/openvino_cg_dev_2025.3.0.0.dockerfile b/dockerfiles/rhel8/openvino_cg_dev_2025.3.0.0.dockerfile
deleted file mode 100644
index cd195257..00000000
--- a/dockerfiles/rhel8/openvino_cg_dev_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM registry.access.redhat.com/ubi8 AS base
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-
-# install product by copying archive content
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-
-RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${INTEL_OPENVINO_DIR}/tools/workbench" && rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM base as opencv  
-LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
-LABEL vendor="Intel Corporation"
-
-RUN rm -f /etc/rhsm-host
-
-COPY ./entitlement /etc/pki/entitlement
-COPY ./rhsm-conf /etc/rhsm
-
-RUN subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
-
-# hadolint ignore=DL3041
-RUN curl --insecure -LO https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
-    && curl --insecure -LO https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm \
-    && dnf install -y epel-release-latest-8.noarch.rpm rpmfusion-free-release-8.noarch.rpm \
-    && dnf install -y \
-        gtk3-devel \
-        gstreamer1-devel \
-        gstreamer1-plugins-base-devel \
-        ffmpeg-devel \
-        libmfx-devel \
-        cmake \
-        git \
-        python39-devel \
-        python39-pip \
-        gcc-c++  \
-        gcc \
-    && dnf clean all
-
-RUN rm -rf /etc/pki/entitlement && rm -rf /etc/rhsm
-
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir numpy==1.23.1
-ARG OPENCV_BRANCH=4.10.0
-WORKDIR /opt/repo
-RUN git clone https://github.com/opencv/opencv.git
-WORKDIR /opt/repo/opencv
-RUN git checkout ${OPENCV_BRANCH}
-WORKDIR /opt/repo/opencv/build
-
-# hadolint ignore=SC2046
-RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
-    cmake \
-    -D BUILD_INFO_SKIP_EXTRA_MODULES=ON \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_JASPER=OFF \
-    -D BUILD_JAVA=OFF \
-    -D BUILD_JPEG=ON \
-    -D BUILD_APPS_LIST=version \
-    -D BUILD_opencv_apps=ON \
-    -D BUILD_opencv_java=OFF \
-    -D BUILD_OPENEXR=OFF \
-    -D BUILD_PNG=ON \
-    -D BUILD_TBB=OFF \
-    -D BUILD_WEBP=OFF \
-    -D BUILD_ZLIB=ON \
-    -D BUILD_TESTS=ON \
-    -D WITH_1394=OFF \
-    -D WITH_CUDA=OFF \
-    -D WITH_EIGEN=OFF \
-    -D WITH_GPHOTO2=OFF \
-    -D WITH_GSTREAMER=ON \
-    -D OPENCV_GAPI_GSTREAMER=OFF \
-    -D WITH_GTK_2_X=OFF \
-    -D WITH_IPP=ON \
-    -D WITH_JASPER=OFF \
-    -D WITH_LAPACK=OFF \
-    -D WITH_MATLAB=OFF \
-    -D WITH_MFX=OFF \
-    -D WITH_OPENCLAMDBLAS=OFF \
-    -D WITH_OPENCLAMDFFT=OFF \
-    -D WITH_OPENEXR=OFF \
-    -D WITH_OPENJPEG=OFF \
-    -D WITH_QUIRC=OFF \
-    -D WITH_TBB=OFF \
-    -D WITH_TIFF=OFF \
-    -D WITH_VTK=OFF \
-    -D WITH_WEBP=OFF \
-    -D CMAKE_USE_RELATIVE_PATHS=ON \
-    -D CMAKE_SKIP_INSTALL_RPATH=ON \
-    -D ENABLE_BUILD_HARDENING=ON \
-    -D ENABLE_CONFIG_VERIFICATION=ON \
-    -D ENABLE_PRECOMPILED_HEADERS=OFF \
-    -D ENABLE_CXX11=ON \
-    -D INSTALL_PDB=ON \
-    -D INSTALL_TESTS=ON \
-    -D INSTALL_C_EXAMPLES=OFF \
-    -D INSTALL_PYTHON_EXAMPLES=OFF \
-    -D CMAKE_INSTALL_PREFIX=install \
-    -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \
-    -D OPENCV_SKIP_PYTHON_LOADER=OFF \
-    -D OPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
-    -D OPENCV_GENERATE_SETUPVARS=OFF \
-    -D OPENCV_BIN_INSTALL_PATH=bin \
-    -D OPENCV_INCLUDE_INSTALL_PATH=include \
-    -D OPENCV_LIB_INSTALL_PATH=lib \
-    -D OPENCV_CONFIG_INSTALL_PATH=cmake \
-    -D OPENCV_3P_LIB_INSTALL_PATH=3rdparty \
-    -D OPENCV_SAMPLES_SRC_INSTALL_PATH=samples \
-    -D OPENCV_DOC_INSTALL_PATH=doc \
-    -D OPENCV_OTHER_INSTALL_PATH=etc \
-    -D OPENCV_LICENSES_INSTALL_PATH=etc/licenses \
-    -D OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=ON \
-    -D BUILD_opencv_world=OFF \
-    -D BUILD_opencv_python2=OFF \
-    -D BUILD_opencv_python3=ON \
-    -D BUILD_opencv_dnn=OFF \
-    -D BUILD_opencv_gapi=OFF \
-    -D PYTHON3_PACKAGES_PATH=install/python/python3 \
-    -D PYTHON3_LIMITED_API=ON \
-    -D HIGHGUI_PLUGIN_LIST=all \
-    -D OPENCV_PYTHON_INSTALL_PATH=python \
-    -D CPU_BASELINE=SSE4_2 \
-    -D OPENCV_IPP_GAUSSIAN_BLUR=ON \
-    -D WITH_INF_ENGINE=ON \
-    -D InferenceEngine_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D ngraph_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D INF_ENGINE_RELEASE=2022010000 \
-    -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer \
-    -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
-    -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    make -j$(nproc) && cmake -P cmake_install.cmake && \
-    rm -Rf install/bin install/etc/samples
-
-WORKDIR /opt/repo/opencv/build/install
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-
-
-
-
-# -----------------
-FROM registry.access.redhat.com/ubi8 AS ov_base
-
-LABEL name="rhel8_dev" \
-      maintainer="openvino_docker@intel.com" \
-      vendor="Intel Corporation" \
-      version="2025.3.0.0" \
-      release="2025.3.0.0" \
-      summary="Provides the latest release of Intel(R) Distribution of OpenVINO(TM) toolkit." \
-      description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on RHEL UBI 8"
-
-WORKDIR /
-USER root
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel /opt/intel
-
-
-
-ARG LGPL_DEPS="gcc-c++ \
-               glibc \
-               libstdc++ \
-               libgcc \
-               python39"
-ARG INSTALL_PACKAGES="-c=opencv_req -c=python -c=opencv_opt -c=core -c=dev"
-
-ARG INSTALL_SOURCES="no"
-
-# hadolint ignore=SC2016
-RUN sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-devel-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-devel-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \
-    sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh
-
-WORKDIR /thirdparty
-# hadolint ignore=DL3031, DL3033, SC2012
-RUN rpm -qa --qf "%{name}\n" > base_packages.txt && \
-	yum update -y && yum install -y ${LGPL_DEPS} && \
-	${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y $INSTALL_PACKAGES && \
-	if [ "$INSTALL_SOURCES" = "yes" ]; then \
-	    yum install -y yum-utils && \
-		rpm -qa --qf "%{name}\n" > all_packages.txt && \
-		grep -v -f base_packages.txt all_packages.txt | while read line; do \
-		package=$(echo $line); \
-		rpm -qa $package --qf "%{name}: %{license}\n" | grep GPL; \
-		exit_status=$?; \
-		if [ $exit_status -eq 0 ]; then \
-		    yumdownloader --skip-broken --source -y $package;  \
-		fi \
-	  done && \
-	  yum autoremove -y yum-utils && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-	yum clean all && rm -rf /var/cache/yum
-
-
-RUN  rm -Rf /etc/pki/entitlement /etc/rhsm/ca /etc/rhsm/rhsm.conf
-
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-WORKDIR /licenses
-RUN cp -rf "${INTEL_OPENVINO_DIR}"/licensing /licenses
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV PYTHON_VER python3.9
-
-RUN ${PYTHON_VER} -m pip install --upgrade pip
-
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION=2025.3.0.0
-ARG OPENVINO_WHEELS_URL
-# hadolint ignore=SC2102,DL3033
-RUN yum install -y cmake git && yum clean all && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino=="${OPENVINO_WHEELS_VERSION}"; \
-    else \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL"; \
-    fi
-
-# download source for PyPi LGPL packages
-WORKDIR /thirdparty
-RUN if [ "$INSTALL_SOURCES" = "yes" ]; then \
-        curl -L https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61/chardet-4.0.0.tar.gz --output chardet-4.0.0.tar.gz; \
-        curl -L https://files.pythonhosted.org/packages/81/41/e6cb9026374771e3bdb4c0fe8ac0c51c693a14b4f72f26275da15f7a4d8b/ethtool-0.14.tar.gz --output ethtool-0.14.tar.gz; \
-        curl -L https://files.pythonhosted.org/packages/ef/86/c5a34243a932346c59cb25eb49a4d1dec227974209eb9b618d0ed57ea5be/gpg-1.10.0.tar.gz --output gpg-1.10.0.tar.gz; \
-        curl -L https://files.pythonhosted.org/packages/e0/e8/1e4f21800015a9ca153969e85fc29f7962f8f82fc5dbc1ecbdeb9dc54c75/PyGObject-3.28.3.tar.gz --output PyGObject-3.28.3.tar.gz; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-runtime.txt --output third-party-programs-docker-runtime.txt && \
-    curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-dev.txt --output third-party-programs-docker-dev.txt
-
-COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
-RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-     echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"
-
-# Install dependencies needed by OV::RemoteTensor
-RUN yum install -y \
-    https://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/opencl-headers-2.2-1.20180306gite986688.el8.noarch.rpm \
-    https://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/ocl-icd-devel-2.2.12-1.el8.x86_64.rpm \
-    https://vault.centos.org/centos/8/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm && \
-    yum clean all
-
-# build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
-WORKDIR "${INTEL_OPENVINO_DIR}"/samples/cpp
-RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \
-    rm -Rf /tmp/build
-
-# add Model API package
-# hadolint ignore=DL3013
-RUN git clone https://github.com/openvinotoolkit/open_model_zoo && \
-    sed -i '/opencv-python/d' open_model_zoo/demos/common/python/requirements.txt && \
-    pip3 --no-cache-dir install open_model_zoo/demos/common/python/ && \
-    rm -Rf open_model_zoo && \
-    python3 -c "from model_zoo import model_api"
-
-# for CPU
-
-# for GPU
-RUN groupmod -g 44 video
-# GFX driver version 22.43.24595.35
-# hadolint ignore=DL3041
-RUN dnf install -y libedit ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-gmmlib-22.3.1-i529.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-igc-core-1.0.12504.6-i537.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-igc-opencl-1.0.12504.6-i537.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-opencl-22.43.24595.35-i538.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-level-zero-gpu-1.3.24595.35-i538.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/level-zero-1.8.8-i524.el8.x86_64.rpm ; \
-    rpm -ivh http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm ; \
-    dnf clean all
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-
-RUN rm -rf /tmp && mkdir /tmp 
-
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/rhel8/openvino_cg_runtime_2025.3.0.0.dockerfile b/dockerfiles/rhel8/openvino_cg_runtime_2025.3.0.0.dockerfile
deleted file mode 100644
index 1903889e..00000000
--- a/dockerfiles/rhel8/openvino_cg_runtime_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM registry.access.redhat.com/ubi8 AS base
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-
-# install product by copying archive content
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-
-RUN tar -xzf "${TEMP_DIR}"/*.tgz && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${INTEL_OPENVINO_DIR}/tools/workbench" && rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-
-# -----------------
-FROM registry.access.redhat.com/ubi8 AS ov_base
-
-LABEL name="rhel8_runtime" \
-      maintainer="openvino_docker@intel.com" \
-      vendor="Intel Corporation" \
-      version="2025.3.0.0" \
-      release="2025.3.0.0" \
-      summary="Provides the latest release of Intel(R) Distribution of OpenVINO(TM) toolkit." \
-      description="This is the runtime image for Intel(R) Distribution of OpenVINO(TM) toolkit on RHEL UBI 8"
-
-WORKDIR /
-USER root
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel /opt/intel
-
-
-
-ARG LGPL_DEPS="bash python39" # no new packages
-ARG INSTALL_PACKAGES="-c=python -c=core"
-
-ARG INSTALL_SOURCES="no"
-
-# hadolint ignore=SC2016
-RUN sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-devel-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-devel-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh && \
-    sed -i -e 's|https://vault.centos.org/centos/8/PowerTools/$arch/os/Packages/gflags-2.1.2-6|http://mirror.centos.org/centos/8-stream/PowerTools/$arch/os/Packages/gflags-2.2.2-1|g' ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh
-
-WORKDIR /thirdparty
-# hadolint ignore=DL3031, DL3033, SC2012
-RUN rpm -qa --qf "%{name}\n" > base_packages.txt && \
-	yum update -y && yum install -y ${LGPL_DEPS} && \
-	${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y $INSTALL_PACKAGES && \
-	if [ "$INSTALL_SOURCES" = "yes" ]; then \
-	    yum install -y yum-utils && \
-		rpm -qa --qf "%{name}\n" > all_packages.txt && \
-		grep -v -f base_packages.txt all_packages.txt | while read line; do \
-		package=$(echo $line); \
-		rpm -qa $package --qf "%{name}: %{license}\n" | grep GPL; \
-		exit_status=$?; \
-		if [ $exit_status -eq 0 ]; then \
-		    yumdownloader --skip-broken --source -y $package;  \
-		fi \
-	  done && \
-	  yum autoremove -y yum-utils && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-	yum clean all && rm -rf /var/cache/yum
-
-
-RUN  rm -Rf /etc/pki/entitlement /etc/rhsm/ca /etc/rhsm/rhsm.conf
-
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-WORKDIR /licenses
-RUN cp -rf "${INTEL_OPENVINO_DIR}"/licensing /licenses
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV PYTHON_VER python3.9
-
-RUN ${PYTHON_VER} -m pip install --upgrade pip
-
-# Install OpenVINO python API dependency
-RUN ${PYTHON_VER} -m pip install --no-cache-dir numpy==1.24.4
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-runtime.txt --output third-party-programs-docker-runtime.txt
-
-# for CPU
-
-# for GPU
-RUN groupmod -g 44 video
-# GFX driver version 22.43.24595.35
-# hadolint ignore=DL3041
-RUN dnf install -y libedit ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-gmmlib-22.3.1-i529.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-igc-core-1.0.12504.6-i537.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-igc-opencl-1.0.12504.6-i537.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-opencl-22.43.24595.35-i538.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/intel-level-zero-gpu-1.3.24595.35-i538.el8.x86_64.rpm ; \
-    rpm -ivh https://repositories.intel.com/graphics/rhel/8.6/level-zero-1.8.8-i524.el8.x86_64.rpm ; \
-    rpm -ivh http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm ; \
-    dnf clean all
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-
-RUN rm -rf /tmp && mkdir /tmp 
-
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu20/build_custom/Dockerfile b/dockerfiles/ubuntu20/build_custom/Dockerfile
deleted file mode 100644
index 93bd1df7..00000000
--- a/dockerfiles/ubuntu20/build_custom/Dockerfile
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright (C) 2020-2022 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:20.04 AS setup_openvino
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends \
-        apt-utils \
-        git \
-        git-lfs \
-        ca-certificates \
-        sudo \
-        tzdata; \
-    rm -rf /var/lib/apt/lists/*
-
-ARG OPENVINO_FORK="openvinotoolkit"
-ARG OPENVINO_BRANCH="master"
-ARG OMZ_BRANCH
-
-# hadolint ignore=DL3003
-RUN git-lfs install; \
-    git clone https://github.com/${OPENVINO_FORK}/openvino.git \
-    --recurse-submodules --shallow-submodules --depth 1 -b ${OPENVINO_BRANCH} /opt/intel/repo/openvino; \
-    if [ -n "$OMZ_BRANCH" ]; then  \
-      cd /opt/intel/repo/openvino/thirdparty/open_model_zoo && \
-      git remote set-branches origin '*' && \
-      git fetch --depth 1 origin "$OMZ_BRANCH" && \
-      git checkout "$OMZ_BRANCH"; \
-    fi
-
-WORKDIR /opt/intel/repo/openvino
-RUN chmod +x install_build_dependencies.sh; \
-    ./install_build_dependencies.sh
-
-RUN chmod +x scripts/install_dependencies/install_NEO_OCL_driver.sh; \
-    ./scripts/install_dependencies/install_NEO_OCL_driver.sh -y --no_numa
-
-# hadolint ignore=DL3013
-RUN chmod +x scripts/install_dependencies/install_openvino_dependencies.sh; \
-    ./scripts/install_dependencies/install_openvino_dependencies.sh -y -c=python; \
-    python3 -m pip install --no-cache-dir --upgrade pip; \
-    python3 -m pip install --no-cache-dir -r src/bindings/python/src/compatibility/openvino/requirements-dev.txt
-
-WORKDIR /opt/intel/repo
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-FROM setup_openvino AS build_openvino
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-COPY openvino_cmake.txt /opt/intel/repo
-
-RUN python3 -m pip install --no-cache-dir -r /opt/intel/repo/openvino/src/bindings/python/wheel/requirements-dev.txt
-
-WORKDIR /opt/intel/repo/openvino/build
-# hadolint ignore=SC2046
-RUN cmake $(cat /opt/intel/repo/openvino_cmake.txt) /opt/intel/repo/openvino; \
-    make "-j$(nproc)"; \
-    make install
-
-WORKDIR /tmp
-RUN curl -L https://github.com/libusb/libusb/archive/v1.0.22.zip --output v1.0.22.zip; \
-    unzip v1.0.22.zip; \
-    rm -rf v1.0.22.zip
-
-WORKDIR /tmp/libusb-1.0.22
-RUN ./bootstrap.sh; \
-    ./configure --disable-udev --enable-shared; \
-    make "-j$(nproc)"
-
-WORKDIR /opt/intel/repo
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-FROM ubuntu:20.04 AS copy_openvino
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-ENV INTEL_OPENVINO_DIR="/opt/intel/openvino"
-
-COPY --from=build_openvino /opt/intel/repo/openvino/build/install ${INTEL_OPENVINO_DIR}
-COPY --from=build_openvino /tmp/libusb-1.0.22 /opt/libusb-1.0.22
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-FROM copy_openvino AS openvino
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y --no-install-recommends \
-        apt-utils \
-        wget \
-        udev \
-        sudo \
-        gdb \
-        tzdata; \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-RUN chmod +x install_dependencies/install_openvino_dependencies.sh; \
-    ./install_dependencies/install_openvino_dependencies.sh -y -c=python -c=dev
-
-RUN chmod +x install_dependencies/install_NEO_OCL_driver.sh; \
-    ./install_dependencies/install_NEO_OCL_driver.sh -y --no_numa
-
-WORKDIR /opt/libusb-1.0.22
-RUN ./libtool --mode=install install -c libusb/libusb-1.0.la /usr/local/lib/; \
-    mkdir -p /usr/local/include/libusb-1.0; \
-    install -c -m 644 libusb/libusb.h /usr/local/include/libusb-1.0; \
-    mkdir -p /usr/local/lib/pkgconfig; \
-    install -c -m 644 libusb-1.0.pc /usr/local/lib/pkgconfig
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-RUN chmod +x install_dependencies/install_NCS_udev_rules.sh; \
-    ./install_dependencies/install_NCS_udev_rules.sh
-
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir --upgrade pip; \
-    python3 -m pip install --no-cache-dir -r python/python3.8/requirements.txt; \
-    python3 -m pip install --no-cache-dir openvino --find-links=tools/ ; \
-    python3 -m pip install --no-cache-dir 'openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]' --find-links=tools/
-
-RUN printf "\nsource \${INTEL_OPENVINO_DIR}/setupvars.sh\n" >> /root/.bashrc
-
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-FROM openvino AS opencv
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-        libva-dev \
-        libgtk-3-dev \
-        libavcodec-dev \
-        libavformat-dev \
-        libavutil-dev \
-        libswscale-dev \
-        libavresample-dev \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev \
-        libgstreamer-plugins-good1.0-dev \
-        libgstreamer-plugins-bad1.0-dev; \
-    rm -rf /var/lib/apt/lists/*
-
-ARG OPENCV_BRANCH="master"
-
-ARG BUILD_OPENCV_CONTRIB="no"
-ARG OPENCV_CONTRIB_BRANCH="master"
-
-WORKDIR /opt/intel/repo
-RUN git clone https://github.com/opencv/opencv.git --depth 1 -b ${OPENCV_BRANCH} && \
-    if [ "$BUILD_OPENCV_CONTRIB" = "yes" ]; then \
-    git clone https://github.com/opencv/opencv_contrib.git --depth 1 -b ${OPENCV_CONTRIB_BRANCH}; fi
-
-COPY opencv_cmake.txt /opt/intel/repo
-
-WORKDIR /opt/intel/repo/opencv/build
-# hadolint ignore=SC2046
-RUN . "${INTEL_OPENVINO_DIR}/setupvars.sh"; \
-    if [ "$BUILD_OPENCV_CONTRIB" = "yes" ]; then \
-      apt-get update && \
-      apt-get install -y --no-install-recommends libtesseract-dev && \
-      cmake $(cat /opt/intel/repo/opencv_cmake.txt) -D OPENCV_EXTRA_MODULES_PATH=/opt/intel/repo/opencv_contrib/modules /opt/intel/repo/opencv && \
-      rm -rf /var/lib/apt/lists/* ; \
-    else \
-      cmake $(cat /opt/intel/repo/opencv_cmake.txt) /opt/intel/repo/opencv; \
-    fi; \
-    make "-j$(nproc)"; \
-    make install
-
-WORKDIR /opt/intel/repo/opencv/build/install
-RUN mkdir "${INTEL_OPENVINO_DIR}/extras"; \
-    cp -r . "${INTEL_OPENVINO_DIR}/extras/opencv"; \
-    cp -r "${INTEL_OPENVINO_DIR}/extras/opencv/python/python3" "${INTEL_OPENVINO_DIR}/python"; \
-    rm -r "${INTEL_OPENVINO_DIR}/extras/opencv/python"; \
-    echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-    echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-    python3 -m pip uninstall -y opencv-python; \
-    rm -rf /opt/intel/repo/opencv/build/install
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-FROM opencv as openvino_repo
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-ENV INTEL_OPENVINO_DIR="/opt/intel/openvino"
-
-COPY --from=build_openvino /opt/intel/repo /opt/intel/repo
-
-# hadolint ignore=DL3013
-RUN ln --symbolic /opt/intel/repo/openvino/thirdparty/open_model_zoo/ ${INTEL_OPENVINO_DIR}/open_model_zoo && \
-    python3 -m pip install --no-cache-dir --no-deps open_model_zoo/demos/common/python
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/dockerfiles/ubuntu20/build_custom/README.md b/dockerfiles/ubuntu20/build_custom/README.md
deleted file mode 100644
index 600d7332..00000000
--- a/dockerfiles/ubuntu20/build_custom/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Build custom Intel® Distribution of OpenVINO™ toolkit Docker image
-This repository folder contains the Dockerfile to build a docker image with the Intel® Distribution of OpenVINO™ toolkit.  
-
-## Components
-* [OpenVINO™ Toolkit - Deep Learning Deployment Toolkit repository](https://github.com/openvinotoolkit/openvino)
-* [OpenCV: Open Source Computer Vision Library](https://github.com/opencv/opencv)
-* [OpenVINO™ Toolkit - Open Model Zoo repository](https://github.com/openvinotoolkit/open_model_zoo)
-
-## How to build
-Go to the folder with the Dockerfile and run:
-```
-docker build -t [image:tag] .
-```
-
-* `/opt/intel/openvino` folder will contain OpenVINO build
-* `/opt/intel/repo` will contain OpenVINO™ and OpenCV git repositories in `openvino` and `opencv` folders accordingly.
-
-
-If you want to rebuild the entire image, use the docker `--no-cache` option:
-```
-docker build --no-cache -t image:tag .
-```
-
-You can use the docker `--build-arg` option to override the following variables:  
-* `OPENVINO_FORK` - To specify a GitHub fork of the OpenVINO repository to use. By default, it is main OpenVINO repository.  
-* `OPENVINO_BRANCH`, `OPENCV_BRANCH`, `OMZ_BRANCH` - To specify branches with source code. By default, they are equal to "master".  
-* `BUILD_OPENCV_CONTRIB` - If set to `yes`, OpenCV will be built with extra modules (default is `no`). You can use the `OPENCV_CONTRIB_BRANCH` argument to specify a branch in the `opencv_contrib` repository.
-
-**For example**:  
-This command builds an image with OpenVINO™ 2021.2 release.
-```
-docker build -t openvino:2021.2 --build-arg OPENVINO_BRANCH="releases/2021/2" .
-```
-
-You can manually set up CMake parameters to build a custom package from source code using these files:  
-* [openvino_cmake.txt](openvino_cmake.txt)
-* [opencv_cmake.txt](opencv_cmake.txt)
-
->**Note**:  
-By default, these files already contain some parameters for *Debug* build  
-Do not override PATH/PREFIX options. This can break a build of package.
-
-### Build stages
-The docker image is built using a multi-step build:
-1. **setup_openvino**  
-    Clone OpenVINO™ git repository with submodules and install build dependencies.  
-    Open Model Zoo will be included as a submodule of OpenVINO.
-2. **build_openvino**  
-    Build OpenVINO™ (CPU, iGPU, VPU support) with the parameters specified in openvino_cmake.txt.  
-    It does not include OpenCV.  
-3. **copy_openvino**  
-    Copy OpenVINO™ build to clear Ubuntu:20.04 image.
-4. **openvino**  
-    Install OpenVINO™ dependencies. Now you can use it.
-5. **opencv**  
-    Build and setup OpenCV with the parameters specified in opencv_cmake.txt.  
-    OpenCV can be optionally built with extra modules (see the `BUILD_OPENCV_CONTRIB` argument description above).
-6. **openvino_repo**  
-    Copy OpenVINO source code repository, build artifacts, and Open Model Zoo demos from the `build_openvino` stage.   
-    *Note: this stage significantly increases the image size.*
-
-Use the docker `--target` option to specify a final stage.
-```
-docker build --target [stage] -t [image:tag] .
-```
-
-**For example**:  
-This command builds an image without OpenCV and OpenVINO source code:
-```
-docker build --target openvino -t ie:latest .
-```
-
-## How to test
-You can use our default pipeline to test your image:
-```
-python3 docker_openvino.py test -t [image:tag] -dist custom 
-```
-
->**Note**:  
-Docker CI framework automatically runs the corresponding tests.  
-By default, the product version is equal to the latest release version. Use `-p` to override this.
-
-## How to run
-Please follow the [Run built image](../get-started.md#run-built-image) section in Docker CI getting started guide.
-
-## Prebuilt images
-
-Prebuilt images are available on: 
-- [Docker Hub](https://hub.docker.com/u/openvino)
-- [Red Hat* Quay.io](https://quay.io/organization/openvino)
-- [Red Hat* Ecosystem Catalog (runtime image)](https://catalog.redhat.com/software/containers/intel/openvino-runtime/606ff4d7ecb5241699188fb3)
-- [Red Hat* Ecosystem Catalog (development image)](https://catalog.redhat.com/software/containers/intel/openvino-dev/613a450dc9bc35f21dc4a1f7)
-- [Azure* Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/intel_corporation.openvino)
-
-
-## License
-This Dockerfile contains third-party components with different licenses.  
-If you are distributing the container as a whole, then you are responsible for license compliance for all of the software it contains.
-
-## Documentation
-* [Install Intel® Distribution of OpenVINO™ toolkit for Linux* from a Docker* Image](https://docs.openvino.ai/latest/openvino_docs_install_guides_installing_openvino_docker_linux.html)
-* [Install Intel® Distribution of OpenVINO™ toolkit for Windows* from Docker* Image](https://docs.openvino.ai/latest/openvino_docs_install_guides_installing_openvino_docker_windows.html)
-* [Official Dockerfile reference](https://docs.docker.com/engine/reference/builder/)
----
-\* Other names and brands may be claimed as the property of others.
\ No newline at end of file
diff --git a/dockerfiles/ubuntu20/build_custom/opencv_cmake.txt b/dockerfiles/ubuntu20/build_custom/opencv_cmake.txt
deleted file mode 100644
index b95a4697..00000000
--- a/dockerfiles/ubuntu20/build_custom/opencv_cmake.txt
+++ /dev/null
@@ -1,27 +0,0 @@
--D CMAKE_INSTALL_PREFIX=install
--D OPENCV_BIN_INSTALL_PATH=bin
--D OPENCV_INCLUDE_INSTALL_PATH=include
--D OPENCV_LIB_INSTALL_PATH=lib
--D OPENCV_CONFIG_INSTALL_PATH=cmake
--D OPENCV_3P_LIB_INSTALL_PATH=3rdparty
--D OPENCV_SAMPLES_SRC_INSTALL_PATH=samples
--D OPENCV_DOC_INSTALL_PATH=doc
--D OPENCV_OTHER_INSTALL_PATH=etc
--D OPENCV_LICENSES_INSTALL_PATH=etc/licenses
--D PYTHON3_PACKAGES_PATH=install/python/python3
-
--D CMAKE_BUILD_TYPE=Debug
--D WITH_INF_ENGINE=ON
--D INF_ENGINE_RELEASE=2022010000
--D WITH_TBB=OFF
--D ENABLE_CXX11=ON
--D OPENCV_SKIP_PYTHON_LOADER=ON
--D OPENCV_GENERATE_SETUPVARS=OFF
--D ENABLE_CONFIG_VERIFICATION=ON
--D WITH_1394=OFF
--D WITH_VTK=OFF
--D WITH_JASPER=OFF
--D WITH_EIGEN=OFF
--D WITH_LAPACK=OFF
--D WITH_OPENCLAMDFFT=OFF
--D WITH_OPENCLAMDBLAS=OFF
\ No newline at end of file
diff --git a/dockerfiles/ubuntu20/build_custom/openvino_cmake.txt b/dockerfiles/ubuntu20/build_custom/openvino_cmake.txt
deleted file mode 100644
index d82e75fa..00000000
--- a/dockerfiles/ubuntu20/build_custom/openvino_cmake.txt
+++ /dev/null
@@ -1,7 +0,0 @@
--D CMAKE_INSTALL_PREFIX=install
-
--D CMAKE_BUILD_TYPE=Debug
--D ENABLE_PYTHON=ON
--D NGRAPH_DEBUG_ENABLE=ON
--D PYTHON_EXECUTABLE=/usr/bin/python3
--D ENABLE_WHEEL=ON
diff --git a/dockerfiles/ubuntu20/openvino_cg_dev_2025.2.0.0.dockerfile b/dockerfiles/ubuntu20/openvino_cg_dev_2025.2.0.0.dockerfile
deleted file mode 100644
index ad0f4040..00000000
--- a/dockerfiles/ubuntu20/openvino_cg_dev_2025.2.0.0.dockerfile
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:20.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM base AS opencv
-
-LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
-LABEL vendor="Intel Corporation"
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-        python3.9-dev \
-        python3-pip \
-        build-essential \
-        cmake \
-        ninja-build \
-        libgtk-3-dev \
-        libpng-dev \
-        libjpeg-dev \
-        libwebp-dev \
-        libtiff5-dev \
-        libopenexr-dev \
-        libopenblas-dev \
-        libx11-dev \
-        libavutil-dev \
-        libavcodec-dev \
-        libavformat-dev \
-        libswscale-dev \
-        libavresample-dev \
-        libtbb2 \
-        libssl-dev \
-        libva-dev \
-        libmfx-dev \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir numpy==1.23.1
-ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests
-WORKDIR /opt/repo
-RUN git clone https://github.com/opencv/opencv.git
-WORKDIR /opt/repo/opencv
-RUN git checkout ${OPENCV_BRANCH} 
-WORKDIR /opt/repo/opencv/build
-
-# hadolint ignore=SC1091
-RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
-    cmake -G Ninja \
-    -D BUILD_INFO_SKIP_EXTRA_MODULES=ON \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_JASPER=OFF \
-    -D BUILD_JAVA=OFF \
-    -D BUILD_JPEG=ON \
-    -D BUILD_APPS_LIST=version \
-    -D BUILD_opencv_apps=ON \
-    -D BUILD_opencv_java=OFF \
-    -D BUILD_OPENEXR=OFF \
-    -D BUILD_PNG=ON \
-    -D BUILD_TBB=OFF \
-    -D BUILD_WEBP=OFF \
-    -D BUILD_ZLIB=ON \
-    -D BUILD_TESTS=ON \
-    -D WITH_1394=OFF \
-    -D WITH_CUDA=OFF \
-    -D WITH_EIGEN=OFF \
-    -D WITH_GPHOTO2=OFF \
-    -D WITH_GSTREAMER=ON \
-    -D OPENCV_GAPI_GSTREAMER=OFF \
-    -D WITH_GTK_2_X=OFF \
-    -D WITH_IPP=ON \
-    -D WITH_JASPER=OFF \
-    -D WITH_LAPACK=OFF \
-    -D WITH_MATLAB=OFF \
-    -D WITH_MFX=ON \
-    -D WITH_OPENCLAMDBLAS=OFF \
-    -D WITH_OPENCLAMDFFT=OFF \
-    -D WITH_OPENEXR=OFF \
-    -D WITH_OPENJPEG=OFF \
-    -D WITH_QUIRC=OFF \
-    -D WITH_TBB=OFF \
-    -D WITH_TIFF=OFF \
-    -D WITH_VTK=OFF \
-    -D WITH_WEBP=OFF \
-    -D CMAKE_USE_RELATIVE_PATHS=ON \
-    -D CMAKE_SKIP_INSTALL_RPATH=ON \
-    -D ENABLE_BUILD_HARDENING=ON \
-    -D ENABLE_CONFIG_VERIFICATION=ON \
-    -D ENABLE_PRECOMPILED_HEADERS=OFF \
-    -D ENABLE_CXX11=ON \
-    -D INSTALL_PDB=ON \
-    -D INSTALL_TESTS=OFF \
-    -D INSTALL_C_EXAMPLES=OFF \
-    -D INSTALL_PYTHON_EXAMPLES=OFF \
-    -D CMAKE_INSTALL_PREFIX=install \
-    -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \
-    -D OPENCV_SKIP_PYTHON_LOADER=OFF \
-    -D OPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
-    -D OPENCV_GENERATE_SETUPVARS=OFF \
-    -D OPENCV_BIN_INSTALL_PATH=bin \
-    -D OPENCV_INCLUDE_INSTALL_PATH=include \
-    -D OPENCV_LIB_INSTALL_PATH=lib \
-    -D OPENCV_CONFIG_INSTALL_PATH=cmake \
-    -D OPENCV_3P_LIB_INSTALL_PATH=3rdparty \
-    -D OPENCV_DOC_INSTALL_PATH=doc \
-    -D OPENCV_OTHER_INSTALL_PATH=etc \
-    -D OPENCV_LICENSES_INSTALL_PATH=etc/licenses \
-    -D OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=ON \
-    -D BUILD_opencv_world=OFF \
-    -D BUILD_opencv_python2=OFF \
-    -D BUILD_opencv_python3=ON \
-    -D BUILD_opencv_dnn=OFF \
-    -D BUILD_opencv_gapi=OFF \
-    -D PYTHON3_PACKAGES_PATH=install/python/python3 \
-    -D PYTHON3_LIMITED_API=ON \
-    -D HIGHGUI_PLUGIN_LIST=all \
-    -D OPENCV_PYTHON_INSTALL_PATH=python \
-    -D CPU_BASELINE=SSE4_2 \
-    -D OPENCV_IPP_GAUSSIAN_BLUR=ON \
-    -D WITH_INF_ENGINE=ON \
-    -D InferenceEngine_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D ngraph_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D INF_ENGINE_RELEASE=2022010000 \
-    -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer,mfx \
-    -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
-    -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    ninja -j "$(nproc)" && cmake --install . && \
-    rm -Rf install/bin install/etc/samples
-
-WORKDIR /opt/repo/opencv/build/install
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-
-
-FROM ubuntu:20.04 AS ov_base
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS="g++ \
-               gcc \
-               libc6-dev \
-               python3.9-venv \
-               python3-pip"
-ARG INSTALL_PACKAGES="-c=python -c=core -c=dev"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3.9 -m venv $VIRTUAL_ENV
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools
-
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION=2025.2.0.0
-ARG OPENVINO_WHEELS_URL
-# hadolint ignore=SC2102
-RUN apt-get update && apt-get install -y --no-install-recommends cmake make git && rm -rf /var/lib/apt/lists/* && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        python3 -m pip install --no-cache-dir openvino=="${OPENVINO_WHEELS_VERSION}" && \
-        python3 -m pip install --no-cache-dir openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" && \
-        python3 -m pip install --no-cache-dir openvino-genai=="${OPENVINO_WHEELS_VERSION}"; \
-    else \
-        python3 -m pip install --no-cache-dir --pre openvino=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        python3 -m pip install --no-cache-dir --pre openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        python3 -m pip install --no-cache-dir --pre openvino-genai=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL"; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu20/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/ubuntu20/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
-RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-     echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"
-
-# Install dependencies for OV::RemoteTensor 
-RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers ocl-icd-opencl-dev && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
-WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp
-RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \
-    rm -Rf /tmp/build
-
-# add Model API package
-# hadolint ignore=DL3013
-RUN git clone https://github.com/openvinotoolkit/open_model_zoo && \
-    sed -i '/opencv-python/d' open_model_zoo/demos/common/python/requirements.txt && \
-    python3 -m pip --no-cache-dir install open_model_zoo/demos/common/python/ && \
-    rm -Rf open_model_zoo && \
-    python3 -c "from model_zoo import model_api"
-
-# for CPU
-
-# for GPU
-
-RUN apt-get update && apt-get install -y --no-install-recommends gpg gpg-agent && \
-    curl https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
-    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu focal-legacy main' | tee  /etc/apt/sources.list.d/intel.gpu.focal.list && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-       intel-opencl-icd=22.43.24595.35+i538~20.04 \
-       intel-level-zero-gpu=1.3.24595.35+i538~20.04 \
-       level-zero=1.8.8+i524~u20.04 \
-       ocl-icd-libopencl1 && \
-       apt-get purge gpg gpg-agent --yes && apt-get --yes autoremove && \
-       apt-get clean ; \
-       rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* 
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu20/openvino_cg_runtime_2025.2.0.0.dockerfile b/dockerfiles/ubuntu20/openvino_cg_runtime_2025.2.0.0.dockerfile
deleted file mode 100644
index 68aaf1e4..00000000
--- a/dockerfiles/ubuntu20/openvino_cg_runtime_2025.2.0.0.dockerfile
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:20.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM ubuntu:20.04 AS ov_base
-
-LABEL description="This is the runtime image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 20.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS="python3.9-venv python3-pip"
-ARG INSTALL_PACKAGES="-c=python -c=core"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3.9 -m venv $VIRTUAL_ENV
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools
-
-# Install OpenVINO python API dependency
-RUN python3 -m pip install --no-cache-dir numpy==1.24.4
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu20/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-# for CPU
-
-# for GPU
-
-RUN apt-get update && apt-get install -y --no-install-recommends gpg gpg-agent && \
-    curl https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \
-    echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu focal-legacy main' | tee  /etc/apt/sources.list.d/intel.gpu.focal.list && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-       intel-opencl-icd=22.43.24595.35+i538~20.04 \
-       intel-level-zero-gpu=1.3.24595.35+i538~20.04 \
-       level-zero=1.8.8+i524~u20.04 \
-       ocl-icd-libopencl1 && \
-       apt-get purge gpg gpg-agent --yes && apt-get --yes autoremove && \
-       apt-get clean ; \
-       rm -rf /var/lib/apt/lists/* && rm -rf /tmp/* 
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu22/openvino_cgn_dev_2025.3.0.0.dockerfile b/dockerfiles/ubuntu22/openvino_cgn_dev_2025.3.0.0.dockerfile
deleted file mode 100644
index 069b0ecd..00000000
--- a/dockerfiles/ubuntu22/openvino_cgn_dev_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:22.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM base AS opencv
-
-LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
-LABEL vendor="Intel Corporation"
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-        python3-dev \
-        python3-pip \
-        build-essential \
-        cmake \
-        ninja-build \
-        libgtk-3-dev \
-        libpng-dev \
-        libjpeg-dev \
-        libwebp-dev \
-        libtiff5-dev \
-        libopenexr-dev \
-        libopenblas-dev \
-        libx11-dev \
-        libavutil-dev \
-        libavcodec-dev \
-        libavformat-dev \
-        libswscale-dev \
-        libswresample-dev \
-        libtbb2 \
-        libssl-dev \
-        libva-dev \
-        libmfx-dev \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN python3 -m pip install --no-cache-dir numpy==1.23.1
-
-ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests
-WORKDIR /opt/repo
-RUN git clone https://github.com/opencv/opencv.git
-WORKDIR /opt/repo/opencv
-RUN git checkout ${OPENCV_BRANCH}
-WORKDIR /opt/repo/opencv/build
-
-# hadolint ignore=SC1091
-RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
-    cmake -G Ninja \
-    -D BUILD_INFO_SKIP_EXTRA_MODULES=ON \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_JASPER=OFF \
-    -D BUILD_JAVA=OFF \
-    -D BUILD_JPEG=ON \
-    -D BUILD_APPS_LIST=version \
-    -D BUILD_opencv_apps=ON \
-    -D BUILD_opencv_java=OFF \
-    -D BUILD_OPENEXR=OFF \
-    -D BUILD_PNG=ON \
-    -D BUILD_TBB=OFF \
-    -D BUILD_WEBP=OFF \
-    -D BUILD_ZLIB=ON \
-    -D BUILD_TESTS=ON \
-    -D WITH_1394=OFF \
-    -D WITH_CUDA=OFF \
-    -D WITH_EIGEN=OFF \
-    -D WITH_GPHOTO2=OFF \
-    -D WITH_GSTREAMER=ON \
-    -D OPENCV_GAPI_GSTREAMER=OFF \
-    -D WITH_GTK_2_X=OFF \
-    -D WITH_IPP=ON \
-    -D WITH_JASPER=OFF \
-    -D WITH_LAPACK=OFF \
-    -D WITH_MATLAB=OFF \
-    -D WITH_MFX=ON \
-    -D WITH_OPENCLAMDBLAS=OFF \
-    -D WITH_OPENCLAMDFFT=OFF \
-    -D WITH_OPENEXR=OFF \
-    -D WITH_OPENJPEG=OFF \
-    -D WITH_QUIRC=OFF \
-    -D WITH_TBB=OFF \
-    -D WITH_TIFF=OFF \
-    -D WITH_VTK=OFF \
-    -D WITH_WEBP=OFF \
-    -D CMAKE_USE_RELATIVE_PATHS=ON \
-    -D CMAKE_SKIP_INSTALL_RPATH=ON \
-    -D ENABLE_BUILD_HARDENING=ON \
-    -D ENABLE_CONFIG_VERIFICATION=ON \
-    -D ENABLE_PRECOMPILED_HEADERS=OFF \
-    -D ENABLE_CXX11=ON \
-    -D INSTALL_PDB=ON \
-    -D INSTALL_TESTS=ON \
-    -D INSTALL_C_EXAMPLES=OFF \
-    -D INSTALL_PYTHON_EXAMPLES=OFF \
-    -D CMAKE_INSTALL_PREFIX=install \
-    -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \
-    -D OPENCV_SKIP_PYTHON_LOADER=OFF \
-    -D OPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
-    -D OPENCV_GENERATE_SETUPVARS=OFF \
-    -D OPENCV_BIN_INSTALL_PATH=bin \
-    -D OPENCV_INCLUDE_INSTALL_PATH=include \
-    -D OPENCV_LIB_INSTALL_PATH=lib \
-    -D OPENCV_CONFIG_INSTALL_PATH=cmake \
-    -D OPENCV_3P_LIB_INSTALL_PATH=3rdparty \
-    -D OPENCV_DOC_INSTALL_PATH=doc \
-    -D OPENCV_OTHER_INSTALL_PATH=etc \
-    -D OPENCV_LICENSES_INSTALL_PATH=etc/licenses \
-    -D OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=ON \
-    -D BUILD_opencv_world=OFF \
-    -D BUILD_opencv_python2=OFF \
-    -D BUILD_opencv_python3=ON \
-    -D BUILD_opencv_dnn=OFF \
-    -D BUILD_opencv_gapi=OFF \
-    -D PYTHON3_PACKAGES_PATH=install/python/python3 \
-    -D PYTHON3_LIMITED_API=ON \
-    -D HIGHGUI_PLUGIN_LIST=all \
-    -D OPENCV_PYTHON_INSTALL_PATH=python \
-    -D CPU_BASELINE=SSE4_2 \
-    -D OPENCV_IPP_GAUSSIAN_BLUR=ON \
-    -D WITH_INF_ENGINE=ON \
-    -D InferenceEngine_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D ngraph_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D INF_ENGINE_RELEASE=2022010000 \
-    -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer,mfx \
-    -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
-    -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    ninja -j "$(nproc)" && cmake --install . && \
-    rm -Rf install/bin install/etc/samples
-
-WORKDIR /opt/repo/opencv/build/install
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-
-
-FROM ubuntu:22.04 AS ov_base
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 22.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS="g++ \
-               gcc \
-               libc6-dev"
-ARG INSTALL_PACKAGES="-c=python -c=core -c=dev"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-RUN curl -L -O  https://github.com/oneapi-src/oneTBB/releases/download/v2021.9.0/oneapi-tbb-2021.9.0-lin.tgz && \
-    tar -xzf  oneapi-tbb-2021.9.0-lin.tgz&& \
-    cp oneapi-tbb-2021.9.0/lib/intel64/gcc4.8/libtbb.so* /opt/intel/openvino/runtime/lib/intel64/ && \
-    rm -Rf oneapi-tbb-2021.9.0*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV PYTHON_VER python3.10
-
-# hadolint ignore=DL3013
-RUN ${PYTHON_VER} -m pip install --upgrade pip
-
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION=2025.3.0.0
-ARG OPENVINO_WHEELS_URL
-# hadolint ignore=SC2102
-RUN apt-get update && apt-get install -y --no-install-recommends cmake make git && rm -rf /var/lib/apt/lists/* && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino=="${OPENVINO_WHEELS_VERSION}" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino-genai=="${OPENVINO_WHEELS_VERSION}"; \
-    else \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino-genai=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL"; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu22/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/ubuntu22/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
-RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-     echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"
-
-# Install dependencies for OV::RemoteTensor
-RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers ocl-icd-opencl-dev && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
-WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp
-RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \
-    rm -Rf /tmp/build
-
-# add Model API package
-# hadolint ignore=DL3013
-RUN git clone https://github.com/openvinotoolkit/open_model_zoo && \
-    sed -i '/opencv-python/d' open_model_zoo/demos/common/python/requirements.txt && \
-    pip3 --no-cache-dir install open_model_zoo/demos/common/python/ && \
-    rm -Rf open_model_zoo && \
-    python3 -c "from model_zoo import model_api"
-
-# for CPU
-
-# for GPU
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ocl-icd-libopencl1 && \
-    apt-get clean ; \
-    rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# GFX driver version 24.48.31907.7
-# hadolint ignore=DL3003
-RUN mkdir /tmp/gpu_deps && cd /tmp/gpu_deps && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-core-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-opencl-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu-dbgsym_1.6.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu_1.6.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd-dbgsym_24.48.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd_24.48.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/libigdgmm12_22.5.4_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/ww48.sum && \
-    sha256sum -c ww48.sum && \
-    dpkg -i ./*.deb && rm -Rf /tmp/gpu_deps
-
-# for NPU
-
-# from https://github.com/oneapi-src/level-zero/releases/tag/v1.20.2
-# from https://github.com/intel/linux-npu-driver/releases/tag/v1.16.0
-
-# hadolint ignore=DL3003
-RUN mkdir /tmp/npu_deps && cd /tmp/npu_deps && \
-    curl -L -O https://github.com/oneapi-src/level-zero/releases/download/v1.21.9/level-zero_1.21.9+u22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-level-zero-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-driver-compiler-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-fw-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    apt-get update && apt-get install --no-install-recommends -y ./*.deb && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/npu_deps
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu22/openvino_cgn_runtime_2025.3.0.0.dockerfile b/dockerfiles/ubuntu22/openvino_cgn_runtime_2025.3.0.0.dockerfile
deleted file mode 100644
index 3a7bb144..00000000
--- a/dockerfiles/ubuntu22/openvino_cgn_runtime_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:22.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM ubuntu:22.04 AS ov_base
-
-LABEL description="This is the runtime image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 22.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS=""
-ARG INSTALL_PACKAGES="-c=python -c=core"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-RUN curl -L -O  https://github.com/oneapi-src/oneTBB/releases/download/v2021.9.0/oneapi-tbb-2021.9.0-lin.tgz && \
-    tar -xzf  oneapi-tbb-2021.9.0-lin.tgz&& \
-    cp oneapi-tbb-2021.9.0/lib/intel64/gcc4.8/libtbb.so* /opt/intel/openvino/runtime/lib/intel64/ && \
-    rm -Rf oneapi-tbb-2021.9.0*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup Python
-ENV PYTHON_VER python3.10
-
-# hadolint ignore=DL3013
-RUN ${PYTHON_VER} -m pip install --upgrade pip
-
-# Install OpenVINO python API dependency
-RUN ${PYTHON_VER} -m pip install --no-cache-dir numpy==1.24.4
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu22/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-# for CPU
-
-# for GPU
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ocl-icd-libopencl1 && \
-    apt-get clean ; \
-    rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# GFX driver version 24.48.31907.7
-# hadolint ignore=DL3003
-RUN mkdir /tmp/gpu_deps && cd /tmp/gpu_deps && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-core-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-opencl-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu-dbgsym_1.6.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu_1.6.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd-dbgsym_24.48.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd_24.48.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/libigdgmm12_22.5.4_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/ww48.sum && \
-    sha256sum -c ww48.sum && \
-    dpkg -i ./*.deb && rm -Rf /tmp/gpu_deps
-
-# for NPU
-
-# from https://github.com/oneapi-src/level-zero/releases/tag/v1.20.2
-# from https://github.com/intel/linux-npu-driver/releases/tag/v1.16.0
-
-# hadolint ignore=DL3003
-RUN mkdir /tmp/npu_deps && cd /tmp/npu_deps && \
-    curl -L -O https://github.com/oneapi-src/level-zero/releases/download/v1.21.9/level-zero_1.21.9+u22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-level-zero-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-driver-compiler-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-fw-npu_1.17.0.20250508-14912879441_ubuntu22.04_amd64.deb && \
-    apt-get update && apt-get install --no-install-recommends -y ./*.deb && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/npu_deps
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu24/openvino_cgn_dev_2025.3.0.0.dockerfile b/dockerfiles/ubuntu24/openvino_cgn_dev_2025.3.0.0.dockerfile
deleted file mode 100644
index ba981a5b..00000000
--- a/dockerfiles/ubuntu24/openvino_cgn_dev_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:24.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM base AS opencv
-
-LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
-LABEL vendor="Intel Corporation"
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-        python3-dev \
-        python3-pip \
-        python3-venv \
-        build-essential \
-        cmake \
-        ninja-build \
-        libgtk-3-dev \
-        libpng-dev \
-        libjpeg-dev \
-        libwebp-dev \
-        libtiff5-dev \
-        libopenexr-dev \
-        libopenblas-dev \
-        libx11-dev \
-        libavutil-dev \
-        libavcodec-dev \
-        libavformat-dev \
-        libswscale-dev \
-        libswresample-dev \
-        # libtbb2 \
-        libssl-dev \
-        libva-dev \
-        libmfx-dev \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-
-# hadolint ignore=DL3013
-RUN python3 -m pip install --no-cache-dir --upgrade pip
-RUN python3 -m pip install --no-cache-dir numpy==1.26.4
-
-ARG OPENCV_BRANCH=4.10.0
-WORKDIR /opt/repo
-RUN git clone https://github.com/opencv/opencv.git
-WORKDIR /opt/repo/opencv
-RUN git checkout ${OPENCV_BRANCH}
-WORKDIR /opt/repo/opencv/build
-
-# hadolint ignore=SC1091
-RUN . "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
-    cmake -G Ninja \
-    -D BUILD_INFO_SKIP_EXTRA_MODULES=ON \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_JASPER=OFF \
-    -D BUILD_JAVA=OFF \
-    -D BUILD_JPEG=ON \
-    -D BUILD_APPS_LIST=version \
-    -D BUILD_opencv_apps=ON \
-    -D BUILD_opencv_java=OFF \
-    -D BUILD_OPENEXR=OFF \
-    -D BUILD_PNG=ON \
-    -D BUILD_TBB=OFF \
-    -D BUILD_WEBP=OFF \
-    -D BUILD_ZLIB=ON \
-    -D BUILD_TESTS=ON \
-    -D WITH_1394=OFF \
-    -D WITH_CUDA=OFF \
-    -D WITH_EIGEN=OFF \
-    -D WITH_GPHOTO2=OFF \
-    -D WITH_GSTREAMER=ON \
-    -D OPENCV_GAPI_GSTREAMER=OFF \
-    -D WITH_GTK_2_X=OFF \
-    -D WITH_IPP=ON \
-    -D WITH_JASPER=OFF \
-    -D WITH_LAPACK=OFF \
-    -D WITH_MATLAB=OFF \
-    -D WITH_MFX=ON \
-    -D WITH_OPENCLAMDBLAS=OFF \
-    -D WITH_OPENCLAMDFFT=OFF \
-    -D WITH_OPENEXR=OFF \
-    -D WITH_OPENJPEG=OFF \
-    -D WITH_QUIRC=OFF \
-    -D WITH_TBB=OFF \
-    -D WITH_TIFF=OFF \
-    -D WITH_VTK=OFF \
-    -D WITH_WEBP=OFF \
-    -D CMAKE_USE_RELATIVE_PATHS=ON \
-    -D CMAKE_SKIP_INSTALL_RPATH=ON \
-    -D ENABLE_BUILD_HARDENING=ON \
-    -D ENABLE_CONFIG_VERIFICATION=ON \
-    -D ENABLE_PRECOMPILED_HEADERS=OFF \
-    -D ENABLE_CXX11=ON \
-    -D INSTALL_PDB=ON \
-    -D INSTALL_TESTS=ON \
-    -D INSTALL_C_EXAMPLES=OFF \
-    -D INSTALL_PYTHON_EXAMPLES=OFF \
-    -D CMAKE_INSTALL_PREFIX=install \
-    -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \
-    -D OPENCV_SKIP_PYTHON_LOADER=OFF \
-    -D OPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
-    -D OPENCV_GENERATE_SETUPVARS=OFF \
-    -D OPENCV_BIN_INSTALL_PATH=bin \
-    -D OPENCV_INCLUDE_INSTALL_PATH=include \
-    -D OPENCV_LIB_INSTALL_PATH=lib \
-    -D OPENCV_CONFIG_INSTALL_PATH=cmake \
-    -D OPENCV_3P_LIB_INSTALL_PATH=3rdparty \
-    -D OPENCV_DOC_INSTALL_PATH=doc \
-    -D OPENCV_OTHER_INSTALL_PATH=etc \
-    -D OPENCV_LICENSES_INSTALL_PATH=etc/licenses \
-    -D OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=ON \
-    -D BUILD_opencv_world=OFF \
-    -D BUILD_opencv_python2=OFF \
-    -D BUILD_opencv_python3=ON \
-    -D BUILD_opencv_dnn=OFF \
-    -D BUILD_opencv_gapi=OFF \
-    -D PYTHON3_PACKAGES_PATH=install/python/python3 \
-    -D PYTHON3_LIMITED_API=ON \
-    -D HIGHGUI_PLUGIN_LIST=all \
-    -D OPENCV_PYTHON_INSTALL_PATH=python \
-    -D CPU_BASELINE=SSE4_2 \
-    -D OPENCV_IPP_GAUSSIAN_BLUR=ON \
-    -D WITH_INF_ENGINE=ON \
-    -D InferenceEngine_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D ngraph_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D INF_ENGINE_RELEASE=2022010000 \
-    -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer,mfx \
-    -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
-    -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    ninja -j "$(nproc)" && cmake --install . && \
-    rm -Rf install/bin install/etc/samples
-
-WORKDIR /opt/repo/opencv/build/install
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-
-
-FROM ubuntu:24.04 AS ov_base
-
-LABEL description="This is the dev image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 22.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS="g++ \
-               gcc \
-               libc6-dev"
-ARG INSTALL_PACKAGES="-c=python -c=core -c=dev"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends python3-venv ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-RUN curl -L -O  https://github.com/oneapi-src/oneTBB/releases/download/v2021.9.0/oneapi-tbb-2021.9.0-lin.tgz && \
-    tar -xzf  oneapi-tbb-2021.9.0-lin.tgz&& \
-    cp oneapi-tbb-2021.9.0/lib/intel64/gcc4.8/libtbb.so* /opt/intel/openvino/runtime/lib/intel64/ && \
-    rm -Rf oneapi-tbb-2021.9.0*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup python
-
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-
-# hadolint ignore=DL3013
-RUN python3 -m pip install  --no-cache-dir --upgrade pip
-
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION=2025.3.0.0
-ARG OPENVINO_WHEELS_URL
-# hadolint ignore=SC2102
-RUN apt-get update && apt-get install -y --no-install-recommends cmake make git && rm -rf /var/lib/apt/lists/* && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        python3 -m pip install --no-cache-dir openvino=="${OPENVINO_WHEELS_VERSION}" && \
-        python3 -m pip install --no-cache-dir openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" && \
-        python3 -m pip install --no-cache-dir openvino-genai=="${OPENVINO_WHEELS_VERSION}"; \
-    else \
-        python3 -m pip install --no-cache-dir --pre openvino=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        python3 -m pip install --no-cache-dir --pre openvino-tokenizers=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        python3 -m pip install --no-cache-dir --pre openvino-genai=="${OPENVINO_WHEELS_VERSION}" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL"; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu24/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/ubuntu24/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
-RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-     echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"
-
-# Install dependencies for OV::RemoteTensor
-RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers ocl-icd-opencl-dev && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
-WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp
-RUN ./build_samples.sh -b /tmp/build -i ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin && \
-    rm -Rf /tmp/build
-
-# add Model API package
-# hadolint ignore=DL3013
-RUN git clone https://github.com/openvinotoolkit/open_model_zoo && \
-    sed -i '/opencv-python/d' open_model_zoo/demos/common/python/requirements.txt && \
-    pip3 --no-cache-dir install open_model_zoo/demos/common/python/ && \
-    rm -Rf open_model_zoo && \
-    python3 -c "from model_zoo import model_api"
-
-# for CPU
-
-# for GPU
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ocl-icd-libopencl1 && \
-    apt-get clean ; \
-    rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# GFX driver version 24.48.31907.7
-# hadolint ignore=DL3003
-RUN mkdir /tmp/gpu_deps && cd /tmp/gpu_deps && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-core-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-opencl-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu-dbgsym_1.6.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu_1.6.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd-dbgsym_24.48.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd_24.48.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/libigdgmm12_22.5.4_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/ww48.sum && \
-    sha256sum -c ww48.sum && \
-    dpkg -i ./*.deb && rm -Rf /tmp/gpu_deps
-
-# for NPU
-
-# from https://github.com/oneapi-src/level-zero/releases/tag/v1.20.2
-# from https://github.com/intel/linux-npu-driver/releases/tag/v1.16.0
-
-# hadolint ignore=DL3003
-RUN mkdir /tmp/npu_deps && cd /tmp/npu_deps && \
-    curl -L -O https://github.com/oneapi-src/level-zero/releases/download/v1.21.9/level-zero_1.21.9+u24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-driver-compiler-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-fw-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-level-zero-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    apt-get update && apt-get install --no-install-recommends -y ./*.deb && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/npu_deps
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/dockerfiles/ubuntu24/openvino_cgn_runtime_2025.3.0.0.dockerfile b/dockerfiles/ubuntu24/openvino_cgn_runtime_2025.3.0.0.dockerfile
deleted file mode 100644
index 511afc8a..00000000
--- a/dockerfiles/ubuntu24/openvino_cgn_runtime_2025.3.0.0.dockerfile
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:24.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
-
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" \( -name "*.tgz" -o -name "*.tar.gz" \) -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo "$OV_BUILD" | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf "${TEMP_DIR}" && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-
-
-FROM ubuntu:24.04 AS ov_base
-
-LABEL description="This is the runtime image for Intel(R) Distribution of OpenVINO(TM) toolkit on Ubuntu 22.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel/ /opt/intel/
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-
-ARG LGPL_DEPS=""
-ARG INSTALL_PACKAGES="-c=python -c=core"
-
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get upgrade -y && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get reinstall -y ca-certificates && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends python3-venv ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-RUN curl -L -O  https://github.com/oneapi-src/oneTBB/releases/download/v2021.9.0/oneapi-tbb-2021.9.0-lin.tgz && \
-    tar -xzf  oneapi-tbb-2021.9.0-lin.tgz&& \
-    cp oneapi-tbb-2021.9.0/lib/intel64/gcc4.8/libtbb.so* /opt/intel/openvino/runtime/lib/intel64/ && \
-    rm -Rf oneapi-tbb-2021.9.0*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV OV_TOKENIZER_PREBUILD_EXTENSION_PATH=/opt/intel/openvino/runtime/lib/intel64/libopenvino_tokenizers.so
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
-
-# setup python
-
-ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH=$VIRTUAL_ENV/bin:$PATH
-
-# hadolint ignore=DL3013
-RUN python3 -m pip install  --no-cache-dir --upgrade pip
-
-# Install OpenVINO python API dependency
-RUN python3 -m pip install --no-cache-dir numpy==1.26.4
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/ubuntu24/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-# for CPU
-
-# for GPU
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ocl-icd-libopencl1 && \
-    apt-get clean ; \
-    rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
-
-# GFX driver version 24.48.31907.7
-# hadolint ignore=DL3003
-RUN mkdir /tmp/gpu_deps && cd /tmp/gpu_deps && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-core-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/intel-graphics-compiler/releases/download/v2.2.3/intel-igc-opencl-2_2.2.3+18220_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu-dbgsym_1.6.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-level-zero-gpu_1.6.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd-dbgsym_24.48.31907.7_amd64.ddeb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/intel-opencl-icd_24.48.31907.7_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/libigdgmm12_22.5.4_amd64.deb && \
-    curl -L -O https://github.com/intel/compute-runtime/releases/download/24.48.31907.7/ww48.sum && \
-    sha256sum -c ww48.sum && \
-    dpkg -i ./*.deb && rm -Rf /tmp/gpu_deps
-
-# for NPU
-
-# from https://github.com/oneapi-src/level-zero/releases/tag/v1.20.2
-# from https://github.com/intel/linux-npu-driver/releases/tag/v1.16.0
-
-# hadolint ignore=DL3003
-RUN mkdir /tmp/npu_deps && cd /tmp/npu_deps && \
-    curl -L -O https://github.com/oneapi-src/level-zero/releases/download/v1.21.9/level-zero_1.21.9+u24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-driver-compiler-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-fw-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    curl -L -O https://github.com/intel/linux-npu-driver/releases/download/v1.17.0/intel-level-zero-npu_1.17.0.20250508-14912879441_ubuntu24.04_amd64.deb && \
-    apt-get update && apt-get install --no-install-recommends -y ./*.deb && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/npu_deps
-
-
-# Post-installation cleanup and setting up OpenVINO environment variables
-ENV LIBVA_DRIVER_NAME=iHD
-ENV GST_VAAPI_ALL_DRIVERS=1
-ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
-
-RUN apt-get update && \
-    apt-get autoremove -y gfortran && \
-    rm -rf /var/lib/apt/lists/*
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
diff --git a/docs/accelerators.md b/docs/accelerators.md
index 7b35f21c..4293128e 100644
--- a/docs/accelerators.md
+++ b/docs/accelerators.md
@@ -19,8 +19,14 @@ While the host and preconfigured docker engine is up and running, use the docker
 
 The command below should report both CPU and GPU devices available for inference execution:
 ```
-export IMAGE=openvino/ubuntu20_dev:2023.0.0
-docker run -it --device /dev/dri --group-add=$(stat -c \"%g\" /dev/dri/render* ) $IMAGE ./samples/cpp/samples_bin/hello_query_device
+export IMAGE=openvino/ubuntu24_dev:2026.2.0
+docker run -it --device /dev/dri --group-add=$(stat -c %g /dev/dri/render* ) $IMAGE python samples/python/hello_query_device/hello_query_device.py
+```
+
+or if `podman` is installed:
+```
+export IMAGE=openvino/ubuntu24_dev:2026.2.0
+podman run -it --device /dev/dri --group-add=keep-groups $IMAGE python samples/python/hello_query_device/hello_query_device.py
 ```
 
 `--device /dev/dri` - it passes the GPU device to the container
@@ -31,8 +37,8 @@ docker run -it --device /dev/dri --group-add=$(stat -c \"%g\" /dev/dri/render* )
 On WSL2, use the command to start the container:
 
 ```
-export IMAGE=openvino/ubuntu20_dev:2023.0.0
-docker run -it --device=/dev/dxg -v /usr/lib/wsl:/usr/lib/wsl $IMAGE ./samples/cpp/samples_bin/hello_query_device
+export IMAGE=openvino/ubuntu24_dev:2026.2.0
+docker run -it --device=/dev/dxg -v /usr/lib/wsl:/usr/lib/wsl $IMAGE python samples/python/hello_query_device/hello_query_device.py
 ```
 `--device /dev/dri` - it passes the virtual GPU device to the container
 `-v /usr/lib/wsl:/usr/lib/wsl` - it mounts required WSL libs into the container
diff --git a/get-started.md b/get-started.md
index e69b3298..5c563abc 100644
--- a/get-started.md
+++ b/get-started.md
@@ -9,13 +9,13 @@ In order to start using them you need to meet the following prerequisites:
 ## Pull a docker image
 
 ```
-docker pull openvino/ubuntu20_dev:latest
+docker pull openvino/ubuntu24_dev:latest
 ```
 
 ## Start the container with an interactive session
 
 ```bash
-export IMAGE=openvino/ubuntu20_dev:latest
+export IMAGE=openvino/ubuntu24_dev:latest
 docker run -it --rm $IMAGE /bin/bash
 ```
 
diff --git a/templates/rhel8/common/base.dockerfile.j2 b/templates/rhel8/common/base.dockerfile.j2
index f6f90019..1031597e 100644
--- a/templates/rhel8/common/base.dockerfile.j2
+++ b/templates/rhel8/common/base.dockerfile.j2
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 FROM registry.access.redhat.com/ubi8
 LABEL name="rhel8_{{ distribution }}" \
diff --git a/templates/rhel8/dist/dev.dockerfile.j2 b/templates/rhel8/dist/dev.dockerfile.j2
index ec2cbd45..0e4f7871 100644
--- a/templates/rhel8/dist/dev.dockerfile.j2
+++ b/templates/rhel8/dist/dev.dockerfile.j2
@@ -20,8 +20,8 @@ RUN if [ "$INSTALL_SOURCES" = "yes" ]; then \
     fi
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-runtime.txt --output third-party-programs-docker-runtime.txt && \
-    curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-dev.txt --output third-party-programs-docker-dev.txt
+COPY templates/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
 RUN cp third-party-programs-docker-dev.txt third-party-programs-docker-runtime.txt /licenses
 
 
diff --git a/templates/rhel8/dist/runtime.dockerfile.j2 b/templates/rhel8/dist/runtime.dockerfile.j2
index 1eac64d1..345eb6de 100644
--- a/templates/rhel8/dist/runtime.dockerfile.j2
+++ b/templates/rhel8/dist/runtime.dockerfile.j2
@@ -1,3 +1,3 @@
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN curl -L https://raw.githubusercontent.com/openvinotoolkit/docker_ci/master/dockerfiles/rhel8/third-party-programs-docker-runtime.txt --output third-party-programs-docker-runtime.txt
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
 RUN cp third-party-programs-docker-runtime.txt /licenses
\ No newline at end of file
diff --git a/dockerfiles/rhel8/third-party-programs-docker-dev.txt b/templates/rhel8/third-party-programs-docker-dev.txt
similarity index 100%
rename from dockerfiles/rhel8/third-party-programs-docker-dev.txt
rename to templates/rhel8/third-party-programs-docker-dev.txt
diff --git a/dockerfiles/rhel8/third-party-programs-docker-runtime.txt b/templates/rhel8/third-party-programs-docker-runtime.txt
similarity index 100%
rename from dockerfiles/rhel8/third-party-programs-docker-runtime.txt
rename to templates/rhel8/third-party-programs-docker-runtime.txt
diff --git a/templates/ubuntu18/common/base.dockerfile.j2 b/templates/ubuntu18/common/base.dockerfile.j2
deleted file mode 100644
index 4a206312..00000000
--- a/templates/ubuntu18/common/base.dockerfile.j2
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM ubuntu:18.04 AS base
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends curl tzdata ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-{% for pre_command in pre_commands %}
-{{ pre_command|safe }}
-{% endfor %}
-RUN rm -rf ${INTEL_OPENVINO_DIR}/.distribution && mkdir ${INTEL_OPENVINO_DIR}/.distribution && \
-    touch ${INTEL_OPENVINO_DIR}/.distribution/docker
-# -----------------
-
-{% if distribution == 'dev' %}
-
-FROM base AS opencv
-
-LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
-LABEL vendor="Intel Corporation"
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-# hadolint ignore=DL3008
-RUN apt-get update; \
-    apt-get install -y --no-install-recommends \
-        git \
-        python3.8-dev \
-        python3-pip \
-        build-essential \
-        cmake \
-        libgtk-3-dev \
-        libpng-dev \
-        libjpeg-dev \
-        libwebp-dev \
-        libtiff5-dev \
-        libopenexr-dev \
-        libopenblas-dev \
-        libx11-dev \
-        libavutil-dev \
-        libavcodec-dev \
-        libavformat-dev \
-        libswscale-dev \
-        libavresample-dev \
-        libtbb2 \
-        libssl-dev \
-        libva-dev \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
-# hadolint ignore=DL3013
-RUN python3 -m pip install --upgrade pip setuptools --no-cache-dir 
-RUN python3 -m pip install --no-cache-dir numpy==1.23.1
-
-ARG OPENCV_BRANCH="4.7.0"
-
-
-WORKDIR /opt/repo
-RUN git clone https://github.com/opencv/opencv.git --depth 1 -b ${OPENCV_BRANCH} 
-
-WORKDIR /opt/repo/opencv/build
-# hadolint ignore=SC2046
-RUN source "${INTEL_OPENVINO_DIR}"/setupvars.sh; \
-    cmake \
-    -D BUILD_INFO_SKIP_EXTRA_MODULES=ON \
-    -D BUILD_EXAMPLES=OFF \
-    -D BUILD_JASPER=OFF \
-    -D BUILD_JAVA=OFF \
-    -D BUILD_JPEG=ON \
-    -D BUILD_APPS_LIST=version \
-    -D BUILD_opencv_apps=ON \
-    -D BUILD_opencv_java=OFF \
-    -D BUILD_OPENEXR=OFF \
-    -D BUILD_PNG=ON \
-    -D BUILD_TBB=OFF \
-    -D BUILD_WEBP=OFF \
-    -D BUILD_ZLIB=ON \
-    -D WITH_1394=OFF \
-    -D WITH_CUDA=OFF \
-    -D WITH_EIGEN=OFF \
-    -D WITH_GPHOTO2=OFF \
-    -D WITH_GSTREAMER=ON \
-    -D OPENCV_GAPI_GSTREAMER=OFF \
-    -D WITH_GTK_2_X=OFF \
-    -D WITH_IPP=ON \
-    -D WITH_JASPER=OFF \
-    -D WITH_LAPACK=OFF \
-    -D WITH_MATLAB=OFF \
-    -D WITH_MFX=OFF \
-    -D WITH_OPENCLAMDBLAS=OFF \
-    -D WITH_OPENCLAMDFFT=OFF \
-    -D WITH_OPENEXR=OFF \
-    -D WITH_OPENJPEG=OFF \
-    -D WITH_QUIRC=OFF \
-    -D WITH_TBB=OFF \
-    -D WITH_TIFF=OFF \
-    -D WITH_VTK=OFF \
-    -D WITH_WEBP=OFF \
-    -D CMAKE_USE_RELATIVE_PATHS=ON \
-    -D CMAKE_SKIP_INSTALL_RPATH=ON \
-    -D ENABLE_BUILD_HARDENING=ON \
-    -D ENABLE_CONFIG_VERIFICATION=ON \
-    -D ENABLE_PRECOMPILED_HEADERS=OFF \
-    -D ENABLE_CXX11=ON \
-    -D INSTALL_PDB=ON \
-    -D INSTALL_TESTS=ON \
-    -D INSTALL_C_EXAMPLES=OFF \
-    -D INSTALL_PYTHON_EXAMPLES=OFF \
-    -D CMAKE_INSTALL_PREFIX=install \
-    -D OPENCV_SKIP_PKGCONFIG_GENERATION=ON \
-    -D OPENCV_SKIP_PYTHON_LOADER=OFF \
-    -D OPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
-    -D OPENCV_GENERATE_SETUPVARS=OFF \
-    -D OPENCV_BIN_INSTALL_PATH=bin \
-    -D OPENCV_INCLUDE_INSTALL_PATH=include \
-    -D OPENCV_LIB_INSTALL_PATH=lib \
-    -D OPENCV_CONFIG_INSTALL_PATH=cmake \
-    -D OPENCV_3P_LIB_INSTALL_PATH=3rdparty \
-    -D OPENCV_DOC_INSTALL_PATH=doc \
-    -D OPENCV_OTHER_INSTALL_PATH=etc \
-    -D OPENCV_LICENSES_INSTALL_PATH=etc/licenses \
-    -D OPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=ON \
-    -D BUILD_opencv_world=OFF \
-    -D BUILD_opencv_python2=OFF \
-    -D BUILD_opencv_python3=ON \
-    -D PYTHON3_PACKAGES_PATH=install/python/python3 \
-    -D PYTHON3_LIMITED_API=ON \
-    -D HIGHGUI_PLUGIN_LIST=all \
-    -D OPENCV_PYTHON_INSTALL_PATH=python \
-    -D CPU_BASELINE=SSE4_2 \
-    -D OPENCV_IPP_GAUSSIAN_BLUR=ON \
-    -D WITH_INF_ENGINE=ON \
-    -D InferenceEngine_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D ngraph_DIR="${INTEL_OPENVINO_DIR}"/runtime/cmake/ \
-    -D INF_ENGINE_RELEASE=2022010000 \
-    -D VIDEOIO_PLUGIN_LIST=ffmpeg,gstreamer,mfx \
-    -D CMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined \
-    -D CMAKE_BUILD_TYPE=Release /opt/repo/opencv && \
-    make -j$(nproc) && make install && \
-    rm -Rf install/bin install/etc/samples
-
-WORKDIR /opt/repo/opencv/build/install
-CMD ["/bin/bash"]
-# -------------------------------------------------------------------------------------------------
-{% endif %}
-
-FROM ubuntu:18.04 AS ov_base
-
-LABEL description="This is the {{ distribution }} image for {{ product_name }} on Ubuntu 18.04 LTS"
-LABEL vendor="Intel Corporation"
-
-USER root
-WORKDIR /
-
-SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU
-RUN sed -ri -e 's@^UMASK[[:space:]]+[[:digit:]]+@UMASK 000@g' /etc/login.defs && \
-	grep -E "^UMASK" /etc/login.defs && useradd -ms /bin/bash -G video,users openvino && \
-    chown openvino -R /home/openvino
-
-RUN mkdir /opt/intel
-
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-COPY --from=base /opt/intel /opt/intel
-
-WORKDIR /thirdparty
-
-ARG INSTALL_SOURCES="no"
-
-ARG DEPS="tzdata \
-          curl"
-{% if 'runtime' == distribution %}
-ARG LGPL_DEPS=
-ARG INSTALL_PACKAGES="-c=opencv_req -c=python -c=cl_compiler -c=core"
-{% elif 'dev' == distribution or 'dev_no_samples' == distribution %}
-ARG LGPL_DEPS="g++ \
-               gcc \
-               libc6-dev"
-ARG INSTALL_PACKAGES="-c=opencv_req -c=python -c=cl_compiler -c=core  -c=dev"
-{% else %}
-ARG LGPL_DEPS="g++ \
-               gcc \
-               libc6-dev"
-ARG INSTALL_PACKAGES="-c=opencv_req -c=python -c=opencv_opt -c=dlstreamer -c=cl_compiler"
-{% endif %}
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > base_packages.txt  && \
-    apt-get install -y --no-install-recommends ${DEPS} && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get install -y ca-certificates --no-install-recommends && rm -rf /var/lib/apt/lists/* && update-ca-certificates
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y ${INSTALL_PACKAGES} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > all_packages.txt && \
-	  grep -v -f base_packages.txt all_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm /usr/lib/python3.*/lib-dynload/readline.cpython-3*-gnu.so && rm -rf /var/lib/apt/lists/*
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-RUN if [ "$INSTALL_SOURCES" = "no" ]; then \
-        echo "This image doesn't contain source for 3d party components under LGPL/GPL licenses. They are stored in https://storage.openvinotoolkit.org/repositories/openvino/ci_dependencies/container_gpl_sources/." > DockerImage_readme.txt ; \
-    fi
-
-{% for command in commands %}
-{{ command|safe }}
-{% endfor %}
-
-USER openvino
-WORKDIR ${INTEL_OPENVINO_DIR}
-ENV DEBIAN_FRONTEND=noninteractive
-
-CMD ["/bin/bash"]
-
-# Setup custom layers below
-{% for layer in layers %}
-{{ layer|safe }}
-{% endfor %}
diff --git a/templates/ubuntu18/dist/dev.dockerfile.j2 b/templates/ubuntu18/dist/dev.dockerfile.j2
deleted file mode 100644
index 43b24165..00000000
--- a/templates/ubuntu18/dist/dev.dockerfile.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-
-RUN apt-get update && apt-get install -y --no-install-recommends git make && rm -rf /var/lib/apt/lists/*
-# hadolint ignore=SC2102
-RUN ${PYTHON_VER} -m pip install --no-cache-dir cmake && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino=="$OPENVINO_WHEELS_VERSION" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]=="$OPENVINO_WHEELS_VERSION" --extra-index-url https://download.pytorch.org/whl/cpu; \
-    else \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino=="$OPENVINO_WHEELS_VERSION" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]=="$OPENVINO_WHEELS_VERSION" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" --extra-index-url https://download.pytorch.org/whl/cpu; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
-
-COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
-RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
-     echo "export LD_LIBRARY_PATH=${INTEL_OPENVINO_DIR}/extras/opencv/lib:\$LD_LIBRARY_PATH" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"
-
-# build samples into ${INTEL_OPENVINO_DIR}/samples/cpp/samples_bin
-WORKDIR ${INTEL_OPENVINO_DIR}/samples/cpp 
-RUN ./build_samples.sh -b build && \
-    cp -R build/intel64/Release samples_bin && cp build/intel64/Release/libformat_reader.so . && \
-    rm -Rf build && mkdir -p build/intel64/Release/lib && mv libformat_reader.so build/intel64/Release/lib/ && rm -Rf samples_bin/lib/
-
-# add Model API package
-# hadolint ignore=DL3013
-RUN git clone https://github.com/openvinotoolkit/open_model_zoo && \
-    sed -i '/opencv-python/d' open_model_zoo/demos/common/python/requirements.txt && \
-    pip3 --no-cache-dir install open_model_zoo/demos/common/python/ && \
-    rm -Rf open_model_zoo && \
-    python3 -c "from openvino.model_zoo import model_api"
diff --git a/templates/ubuntu18/dist/dev_no_samples.dockerfile.j2 b/templates/ubuntu18/dist/dev_no_samples.dockerfile.j2
deleted file mode 100644
index 2dcd3f4b..00000000
--- a/templates/ubuntu18/dist/dev_no_samples.dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-# dev no samples package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-# hadolint ignore=SC2102
-RUN ${PYTHON_VER} -m pip install --no-cache-dir cmake && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino=="$OPENVINO_WHEELS_VERSION" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]=="$OPENVINO_WHEELS_VERSION" ; \
-    else \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino=="$OPENVINO_WHEELS_VERSION" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" && \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]=="$OPENVINO_WHEELS_VERSION" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" ; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/templates/ubuntu18/dist/runtime.dockerfile.j2 b/templates/ubuntu18/dist/runtime.dockerfile.j2
deleted file mode 100644
index 3a2381b8..00000000
--- a/templates/ubuntu18/dist/runtime.dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# runtime package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-RUN ${PYTHON_VER} -m pip install --no-cache-dir cmake && \
-    if [ -z "$OPENVINO_WHEELS_URL" ]; then \
-        ${PYTHON_VER} -m pip install --no-cache-dir openvino=="$OPENVINO_WHEELS_VERSION" ; \
-    else \
-        ${PYTHON_VER} -m pip install --no-cache-dir --pre openvino=="$OPENVINO_WHEELS_VERSION" --trusted-host=* --find-links "$OPENVINO_WHEELS_URL" ; \
-    fi
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/templates/ubuntu18/env/dev_env.dockerfile.j2 b/templates/ubuntu18/env/dev_env.dockerfile.j2
deleted file mode 100644
index 13f0bb7d..00000000
--- a/templates/ubuntu18/env/dev_env.dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/extras/opencv/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
\ No newline at end of file
diff --git a/templates/ubuntu18/env/dev_no_samples_env.dockerfile.j2 b/templates/ubuntu18/env/dev_no_samples_env.dockerfile.j2
deleted file mode 100644
index ca1f7ce7..00000000
--- a/templates/ubuntu18/env/dev_no_samples_env.dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/extras/opencv/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/3rdparty/hddl/lib
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python/python3.6:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
diff --git a/templates/ubuntu18/env/proprietary_env.dockerfile.j2 b/templates/ubuntu18/env/proprietary_env.dockerfile.j2
deleted file mode 100644
index bc46ff13..00000000
--- a/templates/ubuntu18/env/proprietary_env.dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-ENV GI_TYPELIB_PATH=/opt/intel/openvino/extras/gstreamer/lib/girepository-1.0
-ENV GST_PLUGIN_PATH=/opt/intel/openvino/extras/dl_streamer/lib:/opt/intel/openvino/extras/gstreamer/lib/gstreamer-1.0
-ENV GST_PLUGIN_SCANNER=/opt/intel/openvino/extras/gstreamer/bin/gstreamer-1.0/gst-plugin-scanner
-ENV GST_SAMPLES_DIR=/opt/intel/openvino/extras/dl_streamer/samples
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LC_NUMERIC=C
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/extras/dl_streamer/lib:/opt/intel/openvino/extras/gstreamer/lib:/opt/intel/openvino/extras/opencv/lib:/opt/intel/openvino/tools/compile_tool:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/lib/intel64
-ENV LIBRARY_PATH=/opt/intel/openvino/extras/dl_streamer/lib:/opt/intel/openvino/extras/gstreamer/lib:
-ENV MODELS_PATH=/root/intel/dl_streamer/models
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/opt/intel/openvino/extras/gstreamer/bin:/opt/intel/openvino/extras/gstreamer/bin/gstreamer-1.0:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/extras/dl_streamer/lib/pkgconfig:/opt/intel/openvino/extras/gstreamer/lib/pkgconfig:
-ENV PYTHONPATH=/opt/intel/openvino/python/python3.6:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/dl_streamer/python:/opt/intel/openvino/extras/gstreamer/lib/python3.8/site-packages:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
\ No newline at end of file
diff --git a/templates/ubuntu18/env/runtime_env.dockerfile.j2 b/templates/ubuntu18/env/runtime_env.dockerfile.j2
deleted file mode 100644
index 0b8ca84d..00000000
--- a/templates/ubuntu18/env/runtime_env.dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-ENV HDDL_INSTALL_DIR=/opt/intel/openvino/runtime/3rdparty/hddl
-ENV InferenceEngine_DIR=/opt/intel/openvino/runtime/cmake
-ENV LD_LIBRARY_PATH=/opt/intel/openvino/runtime/3rdparty/hddl/lib:/opt/intel/openvino/runtime/3rdparty/tbb/lib:/opt/intel/openvino/runtime/lib/intel64:/opt/intel/openvino/tools/compile_tool
-ENV OpenCV_DIR=/opt/intel/openvino/extras/opencv/cmake
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV PYTHONPATH=/opt/intel/openvino/python/python3.8:/opt/intel/openvino/python/python3:/opt/intel/openvino/extras/opencv/python
-ENV TBB_DIR=/opt/intel/openvino/runtime/3rdparty/tbb/cmake
-ENV ngraph_DIR=/opt/intel/openvino/runtime/cmake
-ENV OpenVINO_DIR=/opt/intel/openvino/runtime/cmake
-ENV INTEL_OPENVINO_DIR=/opt/intel/openvino
-ENV PKG_CONFIG_PATH=/opt/intel/openvino/runtime/lib/intel64/pkgconfig
\ No newline at end of file
diff --git a/templates/ubuntu18/hw/cpu.dockerfile.j2 b/templates/ubuntu18/hw/cpu.dockerfile.j2
deleted file mode 100644
index f0a88068..00000000
--- a/templates/ubuntu18/hw/cpu.dockerfile.j2
+++ /dev/null
@@ -1 +0,0 @@
-# for CPU
\ No newline at end of file
diff --git a/templates/ubuntu18/hw/gpu.dockerfile.j2 b/templates/ubuntu18/hw/gpu.dockerfile.j2
deleted file mode 100644
index 55477398..00000000
--- a/templates/ubuntu18/hw/gpu.dockerfile.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# for GPU
-ARG TEMP_DIR=/tmp/opencl
-
-WORKDIR ${INTEL_OPENVINO_DIR}/install_dependencies
-RUN ./install_NEO_OCL_driver.sh --no_numa -y && \
-    rm -rf /var/lib/apt/lists/*
diff --git a/templates/ubuntu18/hw/hddl.dockerfile.j2 b/templates/ubuntu18/hw/hddl.dockerfile.j2
deleted file mode 100644
index ec9c6fd5..00000000
--- a/templates/ubuntu18/hw/hddl.dockerfile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-# for HDDL
-WORKDIR /tmp
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        libboost-filesystem1.65-dev \
-        libboost-program-options1.65-dev \
-        libboost-thread1.65-dev \
-        libjson-c3 libxxf86vm-dev && \
-    rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
\ No newline at end of file
diff --git a/templates/ubuntu18/hw/pre_vpu.dockerfile.j2 b/templates/ubuntu18/hw/pre_vpu.dockerfile.j2
deleted file mode 100644
index e62f9bf3..00000000
--- a/templates/ubuntu18/hw/pre_vpu.dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-# for VPU
-ARG BUILD_DEPENDENCIES="autoconf \
-                        automake \
-                        build-essential \
-                        libtool \
-                        unzip"
-
-# hadolint ignore=DL3008
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ${BUILD_DEPENDENCIES} && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /opt
-RUN curl -L https://github.com/libusb/libusb/archive/v1.0.22.zip --output v1.0.22.zip && \
-    unzip v1.0.22.zip && rm -rf v1.0.22.zip
-
-WORKDIR /opt/libusb-1.0.22
-RUN ./bootstrap.sh && \
-    ./configure --disable-udev --enable-shared && \
-    make -j4
\ No newline at end of file
diff --git a/templates/ubuntu18/hw/vpu.dockerfile.j2 b/templates/ubuntu18/hw/vpu.dockerfile.j2
deleted file mode 100644
index c9f6b8ed..00000000
--- a/templates/ubuntu18/hw/vpu.dockerfile.j2
+++ /dev/null
@@ -1,44 +0,0 @@
-# for VPU
-ARG LGPL_DEPS=udev
-
-WORKDIR /thirdparty
-
-# hadolint ignore=DL3008, SC2012
-RUN apt-get update && \
-    dpkg --get-selections | grep -v deinstall | awk '{print $1}' > no_vpu_packages.txt && \
-    apt-get install -y --no-install-recommends ${LGPL_DEPS} && \
-    if [ "$INSTALL_SOURCES" = "yes" ]; then \
-      sed -Ei 's/# deb-src /deb-src /' /etc/apt/sources.list && \
-      apt-get update && \
-	  dpkg --get-selections | grep -v deinstall | awk '{print $1}' > vpu_packages.txt && \
-	  grep -v -f no_vpu_packages.txt vpu_packages.txt | while read line; do \
-	  package=$(echo $line); \
-	  name=(${package//:/ }); \
-      grep -l GPL /usr/share/doc/${name[0]}/copyright; \
-      exit_status=$?; \
-	  if [ $exit_status -eq 0 ]; then \
-	    apt-get source -q --download-only $package;  \
-	  fi \
-      done && \
-      echo "Download source for $(ls | wc -l) third-party packages: $(du -sh)"; fi && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=base /opt/libusb-1.0.22 /opt/libusb-1.0.22
-
-# libglib2.0-dev package that is required to build dl_streamer samples
-WORKDIR /opt/libusb-1.0.22/libusb
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends binutils && \
-    /bin/mkdir -p '/usr/local/lib' && \
-    /bin/bash ../libtool   --mode=install /usr/bin/install -c   libusb-1.0.la '/usr/local/lib' && \
-    /bin/mkdir -p '/usr/local/include/libusb-1.0' && \
-    /usr/bin/install -c -m 644 libusb.h '/usr/local/include/libusb-1.0' && \
-    /bin/mkdir -p '/usr/local/lib/pkgconfig' &&\
-    apt-get autoremove -y binutils && \
-    apt-get install libglib2.0-dev g++ -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /opt/libusb-1.0.22/
-RUN /usr/bin/install -c -m 644 libusb-1.0.pc '/usr/local/lib/pkgconfig' && \
-    cp ${INTEL_OPENVINO_DIR}/install_dependencies/97-myriad-usbboot.rules /etc/udev/rules.d/ && \
-    ldconfig
\ No newline at end of file
diff --git a/templates/ubuntu18/install/copy.dockerfile.j2 b/templates/ubuntu18/install/copy.dockerfile.j2
deleted file mode 100644
index 0ac650a4..00000000
--- a/templates/ubuntu18/install/copy.dockerfile.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-# install product by copying archive content
-ARG TEMP_DIR=/tmp/openvino_installer
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-# Creating user openvino and adding it to groups"users"
-RUN useradd -ms /bin/bash -G users openvino
-
-RUN find "${TEMP_DIR}" -name "*.tgz" -o -name "*.tar.gz" -exec tar -xzf {} \; && \
-    OV_BUILD="$(find . -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d.\d+')" && \
-    OV_YEAR="$(echo $OV_BUILD | grep -oP '^[^\d]*(\d+)')" && \
-    OV_FOLDER="$(find . -maxdepth 1 -type d -name "*openvino*")" && \
-    mkdir -p /opt/intel/openvino_"$OV_BUILD"/ && \
-    cp -rf "$OV_FOLDER"/*  /opt/intel/openvino_"$OV_BUILD"/ && \
-    rm -rf "${TEMP_DIR:?}"/"$OV_FOLDER" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD"/ /opt/intel/openvino_"$OV_YEAR" && \
-    rm -rf ${TEMP_DIR} && \
-    chown -R openvino /opt/intel/openvino_"$OV_BUILD"
-{% if no_samples is defined or 'dev_no_samples' == distribution %}
-RUN rm -rf ${INTEL_OPENVINO_DIR}/samples
-{% endif %}
\ No newline at end of file
diff --git a/templates/ubuntu18/install/install.dockerfile.j2 b/templates/ubuntu18/install/install.dockerfile.j2
deleted file mode 100644
index 97b0caad..00000000
--- a/templates/ubuntu18/install/install.dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-# install product by installation script
-ENV INTEL_OPENVINO_DIR /opt/intel/openvino
-
-# hadolint ignore=DL3008, SC2211
-RUN chmod +x l_openvino*.sh && \
-    ./l_openvino*.sh -a -s --eula accept && \
-    mv /opt/intel/openvino/installer /opt/intel/openvino_installer && rmdir /opt/intel/openvino && \
-    OV_BUILD="$(find /opt/intel -maxdepth 1 -type d -name "*openvino*" | grep -oP '(?<=_)\d+.\d+.\d+.\d+')" && \
-    ln --symbolic /opt/intel/openvino_"$OV_BUILD" /opt/intel/openvino && rm -rf ${TEMP_DIR}
-{% if no_samples is defined or 'dev_no_samples' == distribution %}
-RUN rm -rf ${INTEL_OPENVINO_DIR}/samples
-{% endif %}
\ No newline at end of file
diff --git a/templates/ubuntu18/layers/benchmark.dockerfile.j2 b/templates/ubuntu18/layers/benchmark.dockerfile.j2
deleted file mode 100644
index 1bdae213..00000000
--- a/templates/ubuntu18/layers/benchmark.dockerfile.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-# benchmark app package
-
-USER root
-
-RUN apt-get update && \
-    apt install -y sudo && \
-    ${INTEL_OPENVINO_DIR}/install_dependencies/install_openvino_dependencies.sh -y dev && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN sed -i 's+$HOME/inference_engine_${samples_type}_samples_build+/opt/intel/openvino/samples/cpp/samples_build+g' /opt/intel/openvino/samples/cpp/build_samples.sh && \
-    /opt/intel/openvino/samples/cpp/build_samples.sh
-
-# Post-installation cleanup
-RUN rm -rf /tmp && mkdir /tmp
-
-USER openvino
-WORKDIR /opt/intel/openvino/samples/cpp/samples_build/intel64/Release
\ No newline at end of file
diff --git a/templates/ubuntu18/layers/wheel.dockerfile.j2 b/templates/ubuntu18/layers/wheel.dockerfile.j2
deleted file mode 100644
index 7393deee..00000000
--- a/templates/ubuntu18/layers/wheel.dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-# install custom wheel
-USER root
-
-ARG wheel_url
-ADD ${wheel_url} /tmp/custom_wheels/
-RUN python3 -m pip install --no-cache-dir  /tmp/custom_wheels/* && \
-    rm -rf /tmp/*
-
-USER openvino
\ No newline at end of file
diff --git a/templates/ubuntu18/python/python38.dockerfile.j2 b/templates/ubuntu18/python/python38.dockerfile.j2
deleted file mode 100644
index d1e007db..00000000
--- a/templates/ubuntu18/python/python38.dockerfile.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-# setup Python
-ENV PYTHON_VER python3.8
-
-RUN ${PYTHON_VER} -m pip install --upgrade pip setuptools
-RUN update-alternatives --install /usr/bin/python3 python /usr/bin/python3.8 2
\ No newline at end of file
diff --git a/templates/ubuntu18/source/local.dockerfile.j2 b/templates/ubuntu18/source/local.dockerfile.j2
deleted file mode 100644
index 78dff09e..00000000
--- a/templates/ubuntu18/source/local.dockerfile.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# get product from local archive
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-COPY ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/templates/ubuntu18/source/url.dockerfile.j2 b/templates/ubuntu18/source/url.dockerfile.j2
deleted file mode 100644
index 3b3685d2..00000000
--- a/templates/ubuntu18/source/url.dockerfile.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# get product from URL
-ARG package_url
-ARG TEMP_DIR=/tmp/openvino_installer
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/templates/ubuntu20/common/base.dockerfile.j2 b/templates/ubuntu20/common/base.dockerfile.j2
index 416648d2..12670ba3 100644
--- a/templates/ubuntu20/common/base.dockerfile.j2
+++ b/templates/ubuntu20/common/base.dockerfile.j2
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 FROM ubuntu:20.04 AS base
 
diff --git a/templates/ubuntu20/dist/dev.dockerfile.j2 b/templates/ubuntu20/dist/dev.dockerfile.j2
index 25fd5bbc..a9c77d70 100644
--- a/templates/ubuntu20/dist/dev.dockerfile.j2
+++ b/templates/ubuntu20/dist/dev.dockerfile.j2
@@ -15,9 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends cmake make git
     fi
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
 
 COPY --from=opencv /opt/repo/opencv/build/install ${INTEL_OPENVINO_DIR}/extras/opencv
 RUN  echo "export OpenCV_DIR=${INTEL_OPENVINO_DIR}/extras/opencv/cmake" | tee -a "${INTEL_OPENVINO_DIR}/extras/opencv/setupvars.sh"; \
diff --git a/templates/ubuntu20/dist/runtime.dockerfile.j2 b/templates/ubuntu20/dist/runtime.dockerfile.j2
index 81e04cd9..6416d437 100644
--- a/templates/ubuntu20/dist/runtime.dockerfile.j2
+++ b/templates/ubuntu20/dist/runtime.dockerfile.j2
@@ -2,5 +2,4 @@
 RUN python3 -m pip install --no-cache-dir numpy==1.24.4
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/dockerfiles/ubuntu20/third-party-programs-docker-dev.txt b/templates/ubuntu20/third-party-programs-docker-dev.txt
similarity index 100%
rename from dockerfiles/ubuntu20/third-party-programs-docker-dev.txt
rename to templates/ubuntu20/third-party-programs-docker-dev.txt
diff --git a/dockerfiles/ubuntu20/third-party-programs-docker-runtime.txt b/templates/ubuntu20/third-party-programs-docker-runtime.txt
similarity index 100%
rename from dockerfiles/ubuntu20/third-party-programs-docker-runtime.txt
rename to templates/ubuntu20/third-party-programs-docker-runtime.txt
diff --git a/templates/ubuntu22/common/base.dockerfile.j2 b/templates/ubuntu22/common/base.dockerfile.j2
index 8975af85..bc43d546 100644
--- a/templates/ubuntu22/common/base.dockerfile.j2
+++ b/templates/ubuntu22/common/base.dockerfile.j2
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 FROM ubuntu:22.04 AS base
 
diff --git a/templates/ubuntu22/dist/dev.dockerfile.j2 b/templates/ubuntu22/dist/dev.dockerfile.j2
index e19d0f32..48e9d587 100644
--- a/templates/ubuntu22/dist/dev.dockerfile.j2
+++ b/templates/ubuntu22/dist/dev.dockerfile.j2
@@ -15,9 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends cmake make git
     fi
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
 
 # Install dependencies for OV::RemoteTensor
 RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers ocl-icd-opencl-dev && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
diff --git a/templates/ubuntu22/dist/runtime.dockerfile.j2 b/templates/ubuntu22/dist/runtime.dockerfile.j2
index d7e9780e..28ec96df 100644
--- a/templates/ubuntu22/dist/runtime.dockerfile.j2
+++ b/templates/ubuntu22/dist/runtime.dockerfile.j2
@@ -2,5 +2,4 @@
 RUN ${PYTHON_VER} -m pip install --no-cache-dir numpy==1.24.4
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/dockerfiles/ubuntu22/third-party-programs-docker-dev.txt b/templates/ubuntu22/third-party-programs-docker-dev.txt
similarity index 100%
rename from dockerfiles/ubuntu22/third-party-programs-docker-dev.txt
rename to templates/ubuntu22/third-party-programs-docker-dev.txt
diff --git a/dockerfiles/ubuntu22/third-party-programs-docker-runtime.txt b/templates/ubuntu22/third-party-programs-docker-runtime.txt
similarity index 100%
rename from dockerfiles/ubuntu22/third-party-programs-docker-runtime.txt
rename to templates/ubuntu22/third-party-programs-docker-runtime.txt
diff --git a/templates/ubuntu24/common/base.dockerfile.j2 b/templates/ubuntu24/common/base.dockerfile.j2
index c726fa5d..26a34562 100644
--- a/templates/ubuntu24/common/base.dockerfile.j2
+++ b/templates/ubuntu24/common/base.dockerfile.j2
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 FROM ubuntu:24.04 AS base
 
diff --git a/templates/ubuntu24/dist/dev.dockerfile.j2 b/templates/ubuntu24/dist/dev.dockerfile.j2
index 62ed2264..b0c455d7 100644
--- a/templates/ubuntu24/dist/dev.dockerfile.j2
+++ b/templates/ubuntu24/dist/dev.dockerfile.j2
@@ -15,9 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends cmake make git
     fi
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-dev.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-dev.txt ${INTEL_OPENVINO_DIR}/licensing
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
 
 # Install dependencies for OV::RemoteTensor
 RUN apt-get update && apt-get install -y --no-install-recommends opencl-headers ocl-icd-opencl-dev && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
diff --git a/templates/ubuntu24/dist/runtime.dockerfile.j2 b/templates/ubuntu24/dist/runtime.dockerfile.j2
index c28534c6..5ff0cfc4 100644
--- a/templates/ubuntu24/dist/runtime.dockerfile.j2
+++ b/templates/ubuntu24/dist/runtime.dockerfile.j2
@@ -2,5 +2,4 @@
 RUN python3 -m pip install --no-cache-dir numpy==1.26.4
 
 WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
+COPY templates/{{os}}/third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/dockerfiles/ubuntu24/third-party-programs-docker-dev.txt b/templates/ubuntu24/third-party-programs-docker-dev.txt
similarity index 100%
rename from dockerfiles/ubuntu24/third-party-programs-docker-dev.txt
rename to templates/ubuntu24/third-party-programs-docker-dev.txt
diff --git a/dockerfiles/ubuntu24/third-party-programs-docker-runtime.txt b/templates/ubuntu24/third-party-programs-docker-runtime.txt
similarity index 100%
rename from dockerfiles/ubuntu24/third-party-programs-docker-runtime.txt
rename to templates/ubuntu24/third-party-programs-docker-runtime.txt
diff --git a/templates/windows20h2/cmake/cmake314.dockerfile.j2 b/templates/windows20h2/cmake/cmake314.dockerfile.j2
deleted file mode 100644
index 0d1b1e19..00000000
--- a/templates/windows20h2/cmake/cmake314.dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-# setup CMake
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-win64-x64.msi -Proxy %HTTPS_PROXY% -OutFile %TMP%\\cmake-3.14.7-win64-x64.msi ; `
-    Start-Process %TMP%\\cmake-3.14.7-win64-x64.msi -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.14.7-win64-x64.msi -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-win64-x64.msi -OutFile %TMP%\\cmake-3.14.7-win64-x64.msi ; `
-    Start-Process %TMP%\\cmake-3.14.7-win64-x64.msi -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.14.7-win64-x64.msi -Force
-{% endif %}
-RUN SETX /M PATH "C:\Program Files\CMake\Bin;%PATH%"
diff --git a/templates/windows20h2/cmake/cmake34.dockerfile.j2 b/templates/windows20h2/cmake/cmake34.dockerfile.j2
deleted file mode 100644
index ee3d7b4a..00000000
--- a/templates/windows20h2/cmake/cmake34.dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-# setup CMake
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.4.3/cmake-3.4.3-win32-x86.exe -Proxy %HTTPS_PROXY% -OutFile %TMP%\\cmake-3.4.3-win32-x86.exe ; `
-    Start-Process %TMP%\\cmake-3.4.3-win32-x86.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.4.3-win32-x86.exe -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.4.3/cmake-3.4.3-win32-x86.exe -OutFile %TMP%\\cmake-3.4.3-win32-x86.exe ; `
-    Start-Process %TMP%\\cmake-3.4.3-win32-x86.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.4.3-win32-x86.exe -Force
-{% endif %}
-RUN SETX /M PATH "C:\Program Files\CMake\Bin;%PATH%"
diff --git a/templates/windows20h2/common/base.dockerfile.j2 b/templates/windows20h2/common/base.dockerfile.j2
deleted file mode 100644
index cf567285..00000000
--- a/templates/windows20h2/common/base.dockerfile.j2
+++ /dev/null
@@ -1,64 +0,0 @@
-# escape=`
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM mcr.microsoft.com/windows:20H2 AS base
-
-# Restore the default Windows shell for correct batch processing.
-SHELL ["cmd", "/S", "/C"]
-
-USER ContainerAdministrator
-
-{% if HTTPS_PROXY is defined %}
-ARG HTTPS_PROXY
-{% endif %}
-
-{% for command in pre_commands %}
-{{ command|safe }}
-{% endfor %}
-
-# -----------------
-FROM mcr.microsoft.com/windows:20H2 AS ov_base
-
-LABEL description="This is the {{ distribution }} image for {{ product_name }} on Windows OS 20H2"
-LABEL vendor="Intel Corporation"
-
-# Restore the default Windows shell for correct batch processing.
-SHELL ["cmd", "/S", "/C"]
-
-USER ContainerAdministrator
-
-{% if HTTPS_PROXY is defined %}
-ARG HTTPS_PROXY
-{% endif %}
-
-{% for command in commands %}
-{{ command|safe }}
-{% endfor %}
-
-# install opencv
-WORKDIR ${INTEL_OPENVINO_DIR}
-RUN cmd /S /C curl -kL --output opencv-4.6.0-vc14_vc15.exe `
-    https://github.com/opencv/opencv/releases/download/4.6.0/opencv-4.6.0-vc14_vc15.exe && `
-    powershell.exe -Command Start-Process C:\intel\openvino\opencv-4.6.0-vc14_vc15.exe `
-    -ArgumentList '-o"C:\\\\intel\\\\openvino\\\\extras\\\\" -y /quiet /norestart' -Wait && `
-    del opencv-4.6.0-vc14_vc15.exe
-ENV OpenCV_DIR C:\intel\openvino\extras\opencv\build
-
-RUN rmdir /s /q %INTEL_OPENVINO_DIR%\.distribution & mkdir %INTEL_OPENVINO_DIR%\.distribution && `
-    copy /b NUL %INTEL_OPENVINO_DIR%\.distribution\docker
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-
-# Post-installation cleanup
-RUN powershell Remove-Item -Force -Recurse "%TEMP%\*" && `
-    powershell Remove-Item -Force -Recurse "%TEMP_DIR%" && `
-    rmdir /S /Q "%ProgramData%\Package Cache"
-
-USER ContainerUser
-
-CMD ["cmd.exe"]
-
-# Setup custom layers below
-{% for layer in layers %}
-{{ layer|safe }}
-{% endfor %}
\ No newline at end of file
diff --git a/templates/windows20h2/dist/dev.dockerfile.j2 b/templates/windows20h2/dist/dev.dockerfile.j2
deleted file mode 100644
index 3f6ef629..00000000
--- a/templates/windows20h2/dist/dev.dockerfile.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-RUN IF not defined OPENVINO_WHEELS_URL ( `
-        python -m pip install --no-cache-dir openvino==%OPENVINO_WHEELS_VERSION% && `
-        python -m pip install --no-cache-dir openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]==%OPENVINO_WHEELS_VERSION% --use-deprecated=legacy-resolver `
-    ) ELSE ( `
-        python -m pip install --no-cache-dir --pre openvino==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% && `
-        python -m pip install --no-cache-dir --pre openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% `
-    )
diff --git a/templates/windows20h2/dist/runtime.dockerfile.j2 b/templates/windows20h2/dist/runtime.dockerfile.j2
deleted file mode 100644
index b2d77a00..00000000
--- a/templates/windows20h2/dist/runtime.dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# runtime package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-RUN IF not defined OPENVINO_WHEELS_URL ( `
-        python -m pip install --no-cache-dir openvino==%OPENVINO_WHEELS_VERSION% `
-    ) ELSE ( `
-        python -m pip install --no-cache-dir --pre openvino==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% `
-    )
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles\{{os}}\third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/templates/windows20h2/hw/cpu.dockerfile.j2 b/templates/windows20h2/hw/cpu.dockerfile.j2
deleted file mode 100644
index f0a88068..00000000
--- a/templates/windows20h2/hw/cpu.dockerfile.j2
+++ /dev/null
@@ -1 +0,0 @@
-# for CPU
\ No newline at end of file
diff --git a/templates/windows20h2/install/copy.dockerfile.j2 b/templates/windows20h2/install/copy.dockerfile.j2
deleted file mode 100644
index 90d230bf..00000000
--- a/templates/windows20h2/install/copy.dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# install product by copying archive content
-ARG build_id
-ENV INTEL_OPENVINO_DIR C:\intel\openvino_${build_id}
-
-RUN powershell.exe -Command `
-    Expand-Archive -Path "./*.zip" -DestinationPath . -Force ; `
-    $OV_FOLDER=(Get-ChildItem -Filter "*openvino*" -Directory).FullName ; `
-    New-Item -Path C:\intel\ -ItemType Directory -Name openvino_%build_id% ; `
-    Move-Item -Path $OV_FOLDER\* -Destination %INTEL_OPENVINO_DIR% ; `
-    Remove-Item @("""./*.zip""",$OV_FOLDER) -Force -Recurse
-
-RUN powershell.exe -Command if ( -not (Test-Path -Path C:\intel\openvino) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }`
-                    if ( -not (Test-Path -Path C:\intel\openvino_{{year}}) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino_{{year}} -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }
\ No newline at end of file
diff --git a/templates/windows20h2/install/install.dockerfile.j2 b/templates/windows20h2/install/install.dockerfile.j2
deleted file mode 100644
index 98798611..00000000
--- a/templates/windows20h2/install/install.dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# install product by installation script
-ARG build_id
-ENV INTEL_OPENVINO_DIR C:\intel
-
-RUN powershell.exe -Command `
-    Start-Process "./*.exe" -ArgumentList '-s -f %INTEL_OPENVINO_DIR%\openvino_installer -a --silent --eula accept --install-dir %INTEL_OPENVINO_DIR%' -Wait
-
-ENV INTEL_OPENVINO_DIR C:\intel\openvino_${build_id}
-
-RUN powershell.exe -Command if ( -not (Test-Path -Path C:\intel\openvino) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }
\ No newline at end of file
diff --git a/templates/windows20h2/msbuild/msbuild2019.dockerfile.j2 b/templates/windows20h2/msbuild/msbuild2019.dockerfile.j2
deleted file mode 100644
index e1ee5ec2..00000000
--- a/templates/windows20h2/msbuild/msbuild2019.dockerfile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-# setup MSBuild 2019
-ARG VS_DIR=/temp/msbuild2019
-
-WORKDIR ${VS_DIR}
-COPY scripts\msbuild2019\ ${VS_DIR}
-RUN vs_buildtools.exe --quiet --norestart --wait --nocache --noUpdateInstaller --noWeb `
-     --add Microsoft.VisualStudio.Workload.MSBuildTools `
-     --add Microsoft.VisualStudio.Workload.UniversalBuildTools `
-     --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended `
-     --channelUri C:\doesntExist.chman && powershell set-executionpolicy remotesigned
diff --git a/templates/windows20h2/msbuild/msbuild2019_online.dockerfile.j2 b/templates/windows20h2/msbuild/msbuild2019_online.dockerfile.j2
deleted file mode 100644
index 783cb92b..00000000
--- a/templates/windows20h2/msbuild/msbuild2019_online.dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-# setup MSBuild 2019
-RUN powershell.exe -Command $ProgressPreference = 'SilentlyContinue' ; Invoke-WebRequest -URI https://aka.ms/vs/16/release/vs_buildtools.exe -OutFile %TMP%\\vs_buildtools.exe
-
-RUN %TMP%\\vs_buildtools.exe --quiet --norestart --wait --nocache `
-	 --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools" `
-     --add Microsoft.VisualStudio.Workload.MSBuildTools `
-     --add Microsoft.VisualStudio.Workload.UniversalBuildTools `
-     --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 `
-     --remove Microsoft.VisualStudio.Component.Windows81SDK || IF "%ERRORLEVEL%"=="3010" EXIT 0 && powershell set-executionpolicy remotesigned
diff --git a/templates/windows20h2/python/pre_python38.dockerfile.j2 b/templates/windows20h2/python/pre_python38.dockerfile.j2
deleted file mode 100644
index 1d0493a1..00000000
--- a/templates/windows20h2/python/pre_python38.dockerfile.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-        $ProgressPreference = 'SilentlyContinue' ; `
-	Invoke-WebRequest -URI https://github.com/python/cpython/archive/refs/tags/v3.8.12.zip -OutFile %TMP%\\python.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\python.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\python.zip -Force ; `
-	Invoke-WebRequest -URI https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-amd64.zip -OutFile %TMP%\\python-for-build.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\python-for-build.zip -DestinationPath c:\\python-38-10 -Force ; Remove-Item %TMP%\\python-for-build.zip -Force ; `
-    Invoke-WebRequest -URI https://github.com/python/cpython-bin-deps/archive/1cf06233e3ceb49dc0a73c55e04b1174b436b632.zip -OutFile %TMP%\\libffi.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\libffi.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\libffi.zip -Force
-{% else %}
-RUN powershell.exe -Command `
-        $ProgressPreference = 'SilentlyContinue' ; `
-	Invoke-WebRequest -URI https://github.com/python/cpython/archive/refs/tags/v3.8.12.zip -OutFile %TMP%\\python.zip ; `
-	Expand-Archive -Path %TMP%\\python.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\python.zip -Force ; `
-	Invoke-WebRequest -URI https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-amd64.zip -OutFile %TMP%\\python-for-build.zip ; `
-	Expand-Archive -Path %TMP%\\python-for-build.zip -DestinationPath c:\\python-38-10 -Force ; Remove-Item %TMP%\\python-for-build.zip -Force ; `
-    Invoke-WebRequest -URI https://github.com/python/cpython-bin-deps/archive/1cf06233e3ceb49dc0a73c55e04b1174b436b632.zip -OutFile %TMP%\\libffi.zip ; `
-	Expand-Archive -Path %TMP%\\libffi.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\libffi.zip -Force
-{% endif %}
-
-RUN C:\cpython-3.8.12\PCbuild\get_externals.bat --python c:\python-38-10\python.exe && `
-    rmdir /s /q C:\cpython-3.8.12\externals\libffi && mkdir C:\cpython-3.8.12\externals\libffi && `
-    xcopy /s /y c:\cpython-bin-deps-1cf06233e3ceb49dc0a73c55e04b1174b436b632\* c:\cpython-3.8.12\externals\libffi\ && `
-    break > C:\cpython-3.8.12\PCbuild\get_externals.bat
-
-RUN C:\cpython-3.8.12\PCbuild\build.bat -p x64
diff --git a/templates/windows20h2/python/python37.dockerfile.j2 b/templates/windows20h2/python/python37.dockerfile.j2
deleted file mode 100644
index a0df9829..00000000
--- a/templates/windows20h2/python/python37.dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-# setup Python
-ARG PYTHON_VER=python3.7
-
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-  Invoke-WebRequest -URI https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe -Proxy %HTTPS_PROXY% -OutFile %TMP%\\python-3.7.exe ; `
-  Start-Process %TMP%\\python-3.7.exe -ArgumentList '/passive InstallAllUsers=1 PrependPath=1 TargetDir=c:\\Python37' -Wait ; `
-  Remove-Item %TMP%\\python-3.7.exe -Force
-{% else %}
-RUN powershell.exe -Command `
-  Invoke-WebRequest -URI https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe -OutFile %TMP%\\python-3.7.exe ; `
-  Start-Process %TMP%\\python-3.7.exe -ArgumentList '/passive InstallAllUsers=1 PrependPath=1 TargetDir=c:\\Python37' -Wait ; `
-  Remove-Item %TMP%\\python-3.7.exe -Force
-{% endif %}
-# hadolint ignore=DL3013
-RUN python -m pip install --no-cache-dir --upgrade pip
diff --git a/templates/windows20h2/python/python38.dockerfile.j2 b/templates/windows20h2/python/python38.dockerfile.j2
deleted file mode 100644
index e2b03dc8..00000000
--- a/templates/windows20h2/python/python38.dockerfile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-# setup Python
-ARG PYTHON_VER=python3.8
-
-COPY --from=base C:\cpython-3.8.12\PCbuild\amd64 c:\Python38
-COPY --from=base c:\cpython-3.8.12\Lib c:\Python38\Lib
-
-RUN setx /M path "%path%;C:\Python38;C:\Python38\Scripts"
-# hadolint ignore=DL3013
-RUN python -m ensurepip --upgrade --default-pip && `
-    python -m pip install --no-cache-dir --upgrade pip
diff --git a/templates/windows20h2/redist/vs.dockerfile.j2 b/templates/windows20h2/redist/vs.dockerfile.j2
deleted file mode 100644
index c70ddd0a..00000000
--- a/templates/windows20h2/redist/vs.dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Setup Microsoft Visual C++ 2015-2019 Redistributable (x64) - 14.27.29016
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://aka.ms/vs/16/release/vc_redist.x64.exe -Proxy %HTTPS_PROXY%  -OutFile "%TMP%\vc_redist.x64.exe" ; `
-    Start-Process %TMP%\\vc_redist.x64.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item "%TMP%\vc_redist.x64.exe" -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://aka.ms/vs/16/release/vc_redist.x64.exe -OutFile "%TMP%\vc_redist.x64.exe" ; `
-    Start-Process %TMP%\\vc_redist.x64.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item "%TMP%\vc_redist.x64.exe" -Force
-{% endif %}
diff --git a/templates/windows20h2/source/local.dockerfile.j2 b/templates/windows20h2/source/local.dockerfile.j2
deleted file mode 100644
index 446f0ec0..00000000
--- a/templates/windows20h2/source/local.dockerfile.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# get product from local path
-ARG package_url
-ARG TEMP_DIR=/temp
-
-WORKDIR ${TEMP_DIR}
-COPY ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/templates/windows20h2/source/url.dockerfile.j2 b/templates/windows20h2/source/url.dockerfile.j2
deleted file mode 100644
index 24144b4e..00000000
--- a/templates/windows20h2/source/url.dockerfile.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# download package from external URL
-ARG package_url
-ARG TEMP_DIR=/temp
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/templates/winserver2019/cmake/cmake314.dockerfile.j2 b/templates/winserver2019/cmake/cmake314.dockerfile.j2
deleted file mode 100644
index 0d1b1e19..00000000
--- a/templates/winserver2019/cmake/cmake314.dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-# setup CMake
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-win64-x64.msi -Proxy %HTTPS_PROXY% -OutFile %TMP%\\cmake-3.14.7-win64-x64.msi ; `
-    Start-Process %TMP%\\cmake-3.14.7-win64-x64.msi -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.14.7-win64-x64.msi -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-win64-x64.msi -OutFile %TMP%\\cmake-3.14.7-win64-x64.msi ; `
-    Start-Process %TMP%\\cmake-3.14.7-win64-x64.msi -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.14.7-win64-x64.msi -Force
-{% endif %}
-RUN SETX /M PATH "C:\Program Files\CMake\Bin;%PATH%"
diff --git a/templates/winserver2019/cmake/cmake34.dockerfile.j2 b/templates/winserver2019/cmake/cmake34.dockerfile.j2
deleted file mode 100644
index ee3d7b4a..00000000
--- a/templates/winserver2019/cmake/cmake34.dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-# setup CMake
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.4.3/cmake-3.4.3-win32-x86.exe -Proxy %HTTPS_PROXY% -OutFile %TMP%\\cmake-3.4.3-win32-x86.exe ; `
-    Start-Process %TMP%\\cmake-3.4.3-win32-x86.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.4.3-win32-x86.exe -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://github.com/Kitware/CMake/releases/download/v3.4.3/cmake-3.4.3-win32-x86.exe -OutFile %TMP%\\cmake-3.4.3-win32-x86.exe ; `
-    Start-Process %TMP%\\cmake-3.4.3-win32-x86.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item %TMP%\\cmake-3.4.3-win32-x86.exe -Force
-{% endif %}
-RUN SETX /M PATH "C:\Program Files\CMake\Bin;%PATH%"
diff --git a/templates/winserver2019/common/base.dockerfile.j2 b/templates/winserver2019/common/base.dockerfile.j2
deleted file mode 100644
index 7d33e131..00000000
--- a/templates/winserver2019/common/base.dockerfile.j2
+++ /dev/null
@@ -1,64 +0,0 @@
-# escape=`
-# Copyright (C) 2019-2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-FROM mcr.microsoft.com/windows/servercore:ltsc2019 AS base
-
-# Restore the default Windows shell for correct batch processing.
-SHELL ["cmd", "/S", "/C"]
-
-USER ContainerAdministrator
-
-{% if HTTPS_PROXY is defined %}
-ARG HTTPS_PROXY
-{% endif %}
-
-{% for command in pre_commands %}
-{{ command|safe }}
-{% endfor %}
-
-# -----------------
-FROM mcr.microsoft.com/windows/servercore:ltsc2019 AS ov_base
-
-LABEL description="This is the {{ distribution }} image for {{ product_name }} on Windows Server LTSC 2019"
-LABEL vendor="Intel Corporation"
-
-# Restore the default Windows shell for correct batch processing.
-SHELL ["cmd", "/S", "/C"]
-
-USER ContainerAdministrator
-
-{% if HTTPS_PROXY is defined %}
-ARG HTTPS_PROXY
-{% endif %}
-
-{% for command in commands %}
-{{ command|safe }}
-{% endfor %}
-
-# install opencv
-WORKDIR ${INTEL_OPENVINO_DIR}
-RUN cmd /S /C curl -kL --output opencv-4.6.0-vc14_vc15.exe `
-    https://github.com/opencv/opencv/releases/download/4.6.0/opencv-4.6.0-vc14_vc15.exe && `
-    powershell.exe -Command Start-Process C:\intel\openvino\opencv-4.6.0-vc14_vc15.exe `
-    -ArgumentList '-o"C:\\\\intel\\\\openvino\\\\extras\\\\" -y /quiet /norestart' -Wait && `
-    del opencv-4.6.0-vc14_vc15.exe
-ENV OpenCV_DIR C:\intel\openvino\extras\opencv\build
-
-RUN rmdir /s /q %INTEL_OPENVINO_DIR%\.distribution & mkdir %INTEL_OPENVINO_DIR%\.distribution && `
-    copy /b NUL %INTEL_OPENVINO_DIR%\.distribution\docker
-
-WORKDIR ${INTEL_OPENVINO_DIR}
-
-# Post-installation cleanup
-RUN powershell Remove-Item -Force -Recurse "%TEMP%\*" && `
-    powershell Remove-Item -Force -Recurse "%TEMP_DIR%" && `
-    rmdir /S /Q "%ProgramData%\Package Cache"
-
-USER ContainerUser
-
-CMD ["cmd.exe"]
-
-# Setup custom layers below
-{% for layer in layers %}
-{{ layer|safe }}
-{% endfor %}
\ No newline at end of file
diff --git a/templates/winserver2019/dist/dev.dockerfile.j2 b/templates/winserver2019/dist/dev.dockerfile.j2
deleted file mode 100644
index 9348d338..00000000
--- a/templates/winserver2019/dist/dev.dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# dev package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-RUN IF not defined OPENVINO_WHEELS_URL ( `
-        python -m pip install --no-cache-dir openvino==%OPENVINO_WHEELS_VERSION% && `
-        python -m pip install --no-cache-dir openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]==%OPENVINO_WHEELS_VERSION% --use-deprecated=legacy-resolver `
-    ) ELSE ( `
-        python -m pip install --no-cache-dir --pre openvino==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% && `
-        python -m pip install --no-cache-dir --pre openvino_dev[caffe,kaldi,mxnet,onnx,pytorch,tensorflow2]==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% `
-    )
-# hadolint ignore=DL3013
-RUN python -m pip uninstall -y opencv-python && `
-    python -m pip install --no-cache-dir opencv-python-headless
diff --git a/templates/winserver2019/dist/runtime.dockerfile.j2 b/templates/winserver2019/dist/runtime.dockerfile.j2
deleted file mode 100644
index b2d77a00..00000000
--- a/templates/winserver2019/dist/runtime.dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# runtime package
-WORKDIR ${INTEL_OPENVINO_DIR}
-ARG OPENVINO_WHEELS_VERSION={{ product_version }}
-ARG OPENVINO_WHEELS_URL
-RUN IF not defined OPENVINO_WHEELS_URL ( `
-        python -m pip install --no-cache-dir openvino==%OPENVINO_WHEELS_VERSION% `
-    ) ELSE ( `
-        python -m pip install --no-cache-dir --pre openvino==%OPENVINO_WHEELS_VERSION% --trusted-host=* --find-links %OPENVINO_WHEELS_URL% `
-    )
-
-WORKDIR ${INTEL_OPENVINO_DIR}/licensing
-# Please use `third-party-programs-docker-runtime.txt` short path to 3d party file if you use the Dockerfile directly from docker_ci/dockerfiles repo folder
-COPY dockerfiles\{{os}}\third-party-programs-docker-runtime.txt ${INTEL_OPENVINO_DIR}/licensing
\ No newline at end of file
diff --git a/templates/winserver2019/hw/cpu.dockerfile.j2 b/templates/winserver2019/hw/cpu.dockerfile.j2
deleted file mode 100644
index f0a88068..00000000
--- a/templates/winserver2019/hw/cpu.dockerfile.j2
+++ /dev/null
@@ -1 +0,0 @@
-# for CPU
\ No newline at end of file
diff --git a/templates/winserver2019/install/copy.dockerfile.j2 b/templates/winserver2019/install/copy.dockerfile.j2
deleted file mode 100644
index 90d230bf..00000000
--- a/templates/winserver2019/install/copy.dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-# install product by copying archive content
-ARG build_id
-ENV INTEL_OPENVINO_DIR C:\intel\openvino_${build_id}
-
-RUN powershell.exe -Command `
-    Expand-Archive -Path "./*.zip" -DestinationPath . -Force ; `
-    $OV_FOLDER=(Get-ChildItem -Filter "*openvino*" -Directory).FullName ; `
-    New-Item -Path C:\intel\ -ItemType Directory -Name openvino_%build_id% ; `
-    Move-Item -Path $OV_FOLDER\* -Destination %INTEL_OPENVINO_DIR% ; `
-    Remove-Item @("""./*.zip""",$OV_FOLDER) -Force -Recurse
-
-RUN powershell.exe -Command if ( -not (Test-Path -Path C:\intel\openvino) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }`
-                    if ( -not (Test-Path -Path C:\intel\openvino_{{year}}) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino_{{year}} -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }
\ No newline at end of file
diff --git a/templates/winserver2019/install/install.dockerfile.j2 b/templates/winserver2019/install/install.dockerfile.j2
deleted file mode 100644
index 98798611..00000000
--- a/templates/winserver2019/install/install.dockerfile.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-# install product by installation script
-ARG build_id
-ENV INTEL_OPENVINO_DIR C:\intel
-
-RUN powershell.exe -Command `
-    Start-Process "./*.exe" -ArgumentList '-s -f %INTEL_OPENVINO_DIR%\openvino_installer -a --silent --eula accept --install-dir %INTEL_OPENVINO_DIR%' -Wait
-
-ENV INTEL_OPENVINO_DIR C:\intel\openvino_${build_id}
-
-RUN powershell.exe -Command if ( -not (Test-Path -Path C:\intel\openvino) ) `
-                    {`
-                        New-Item -Path C:\intel\openvino -ItemType SymbolicLink -Value %INTEL_OPENVINO_DIR%`
-                    }
\ No newline at end of file
diff --git a/templates/winserver2019/msbuild/msbuild2019.dockerfile.j2 b/templates/winserver2019/msbuild/msbuild2019.dockerfile.j2
deleted file mode 100644
index e1ee5ec2..00000000
--- a/templates/winserver2019/msbuild/msbuild2019.dockerfile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-# setup MSBuild 2019
-ARG VS_DIR=/temp/msbuild2019
-
-WORKDIR ${VS_DIR}
-COPY scripts\msbuild2019\ ${VS_DIR}
-RUN vs_buildtools.exe --quiet --norestart --wait --nocache --noUpdateInstaller --noWeb `
-     --add Microsoft.VisualStudio.Workload.MSBuildTools `
-     --add Microsoft.VisualStudio.Workload.UniversalBuildTools `
-     --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended `
-     --channelUri C:\doesntExist.chman && powershell set-executionpolicy remotesigned
diff --git a/templates/winserver2019/msbuild/msbuild2019_online.dockerfile.j2 b/templates/winserver2019/msbuild/msbuild2019_online.dockerfile.j2
deleted file mode 100644
index 783cb92b..00000000
--- a/templates/winserver2019/msbuild/msbuild2019_online.dockerfile.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-# setup MSBuild 2019
-RUN powershell.exe -Command $ProgressPreference = 'SilentlyContinue' ; Invoke-WebRequest -URI https://aka.ms/vs/16/release/vs_buildtools.exe -OutFile %TMP%\\vs_buildtools.exe
-
-RUN %TMP%\\vs_buildtools.exe --quiet --norestart --wait --nocache `
-	 --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools" `
-     --add Microsoft.VisualStudio.Workload.MSBuildTools `
-     --add Microsoft.VisualStudio.Workload.UniversalBuildTools `
-     --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 `
-     --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 `
-     --remove Microsoft.VisualStudio.Component.Windows81SDK || IF "%ERRORLEVEL%"=="3010" EXIT 0 && powershell set-executionpolicy remotesigned
diff --git a/templates/winserver2019/python/pre_python38.dockerfile.j2 b/templates/winserver2019/python/pre_python38.dockerfile.j2
deleted file mode 100644
index 1d0493a1..00000000
--- a/templates/winserver2019/python/pre_python38.dockerfile.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-        $ProgressPreference = 'SilentlyContinue' ; `
-	Invoke-WebRequest -URI https://github.com/python/cpython/archive/refs/tags/v3.8.12.zip -OutFile %TMP%\\python.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\python.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\python.zip -Force ; `
-	Invoke-WebRequest -URI https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-amd64.zip -OutFile %TMP%\\python-for-build.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\python-for-build.zip -DestinationPath c:\\python-38-10 -Force ; Remove-Item %TMP%\\python-for-build.zip -Force ; `
-    Invoke-WebRequest -URI https://github.com/python/cpython-bin-deps/archive/1cf06233e3ceb49dc0a73c55e04b1174b436b632.zip -OutFile %TMP%\\libffi.zip -Proxy %HTTPS_PROXY% ; `
-	Expand-Archive -Path %TMP%\\libffi.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\libffi.zip -Force
-{% else %}
-RUN powershell.exe -Command `
-        $ProgressPreference = 'SilentlyContinue' ; `
-	Invoke-WebRequest -URI https://github.com/python/cpython/archive/refs/tags/v3.8.12.zip -OutFile %TMP%\\python.zip ; `
-	Expand-Archive -Path %TMP%\\python.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\python.zip -Force ; `
-	Invoke-WebRequest -URI https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-amd64.zip -OutFile %TMP%\\python-for-build.zip ; `
-	Expand-Archive -Path %TMP%\\python-for-build.zip -DestinationPath c:\\python-38-10 -Force ; Remove-Item %TMP%\\python-for-build.zip -Force ; `
-    Invoke-WebRequest -URI https://github.com/python/cpython-bin-deps/archive/1cf06233e3ceb49dc0a73c55e04b1174b436b632.zip -OutFile %TMP%\\libffi.zip ; `
-	Expand-Archive -Path %TMP%\\libffi.zip -DestinationPath c:\\ -Force ; Remove-Item %TMP%\\libffi.zip -Force
-{% endif %}
-
-RUN C:\cpython-3.8.12\PCbuild\get_externals.bat --python c:\python-38-10\python.exe && `
-    rmdir /s /q C:\cpython-3.8.12\externals\libffi && mkdir C:\cpython-3.8.12\externals\libffi && `
-    xcopy /s /y c:\cpython-bin-deps-1cf06233e3ceb49dc0a73c55e04b1174b436b632\* c:\cpython-3.8.12\externals\libffi\ && `
-    break > C:\cpython-3.8.12\PCbuild\get_externals.bat
-
-RUN C:\cpython-3.8.12\PCbuild\build.bat -p x64
diff --git a/templates/winserver2019/python/python37.dockerfile.j2 b/templates/winserver2019/python/python37.dockerfile.j2
deleted file mode 100644
index a0df9829..00000000
--- a/templates/winserver2019/python/python37.dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-# setup Python
-ARG PYTHON_VER=python3.7
-
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-  Invoke-WebRequest -URI https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe -Proxy %HTTPS_PROXY% -OutFile %TMP%\\python-3.7.exe ; `
-  Start-Process %TMP%\\python-3.7.exe -ArgumentList '/passive InstallAllUsers=1 PrependPath=1 TargetDir=c:\\Python37' -Wait ; `
-  Remove-Item %TMP%\\python-3.7.exe -Force
-{% else %}
-RUN powershell.exe -Command `
-  Invoke-WebRequest -URI https://www.python.org/ftp/python/3.7.9/python-3.7.9-amd64.exe -OutFile %TMP%\\python-3.7.exe ; `
-  Start-Process %TMP%\\python-3.7.exe -ArgumentList '/passive InstallAllUsers=1 PrependPath=1 TargetDir=c:\\Python37' -Wait ; `
-  Remove-Item %TMP%\\python-3.7.exe -Force
-{% endif %}
-# hadolint ignore=DL3013
-RUN python -m pip install --no-cache-dir --upgrade pip
diff --git a/templates/winserver2019/python/python38.dockerfile.j2 b/templates/winserver2019/python/python38.dockerfile.j2
deleted file mode 100644
index e2b03dc8..00000000
--- a/templates/winserver2019/python/python38.dockerfile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-# setup Python
-ARG PYTHON_VER=python3.8
-
-COPY --from=base C:\cpython-3.8.12\PCbuild\amd64 c:\Python38
-COPY --from=base c:\cpython-3.8.12\Lib c:\Python38\Lib
-
-RUN setx /M path "%path%;C:\Python38;C:\Python38\Scripts"
-# hadolint ignore=DL3013
-RUN python -m ensurepip --upgrade --default-pip && `
-    python -m pip install --no-cache-dir --upgrade pip
diff --git a/templates/winserver2019/redist/vs.dockerfile.j2 b/templates/winserver2019/redist/vs.dockerfile.j2
deleted file mode 100644
index c70ddd0a..00000000
--- a/templates/winserver2019/redist/vs.dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# Setup Microsoft Visual C++ 2015-2019 Redistributable (x64) - 14.27.29016
-{% if HTTPS_PROXY is defined %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://aka.ms/vs/16/release/vc_redist.x64.exe -Proxy %HTTPS_PROXY%  -OutFile "%TMP%\vc_redist.x64.exe" ; `
-    Start-Process %TMP%\\vc_redist.x64.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item "%TMP%\vc_redist.x64.exe" -Force
-{% else %}
-RUN powershell.exe -Command `
-    $ProgressPreference = 'SilentlyContinue' ; `
-    Invoke-WebRequest -URI https://aka.ms/vs/16/release/vc_redist.x64.exe -OutFile "%TMP%\vc_redist.x64.exe" ; `
-    Start-Process %TMP%\\vc_redist.x64.exe -ArgumentList '/quiet /norestart' -Wait ; `
-    Remove-Item "%TMP%\vc_redist.x64.exe" -Force
-{% endif %}
diff --git a/templates/winserver2019/source/local.dockerfile.j2 b/templates/winserver2019/source/local.dockerfile.j2
deleted file mode 100644
index 446f0ec0..00000000
--- a/templates/winserver2019/source/local.dockerfile.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-# get product from local path
-ARG package_url
-ARG TEMP_DIR=/temp
-
-WORKDIR ${TEMP_DIR}
-COPY ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/templates/winserver2019/source/url.dockerfile.j2 b/templates/winserver2019/source/url.dockerfile.j2
deleted file mode 100644
index 24144b4e..00000000
--- a/templates/winserver2019/source/url.dockerfile.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# download package from external URL
-ARG package_url
-ARG TEMP_DIR=/temp
-
-WORKDIR ${TEMP_DIR}
-# hadolint ignore=DL3020
-ADD ${package_url} ${TEMP_DIR}
\ No newline at end of file
diff --git a/utils/arg_parser.py b/utils/arg_parser.py
index d67af238..bc9e5cbb 100644
--- a/utils/arg_parser.py
+++ b/utils/arg_parser.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """CLI arguments parser for this framework"""
 import argparse
@@ -21,12 +21,8 @@ class DockerCIArgumentParser(argparse.ArgumentParser):
     """CLI argument parser for this framework"""
 
     SUPPORTED_OS: typing.List = [
-        "ubuntu18",
-        "ubuntu20",
         "ubuntu22",
         "ubuntu24",
-        "winserver2019",
-        "windows20h2",
         "rhel8",
     ]
 
@@ -233,7 +229,7 @@ def add_dist_args(cls, parser: argparse.ArgumentParser):
             "-os",
             choices=cls.SUPPORTED_OS,
             default="",
-            help="Operation System for docker image.",
+            help="Operating system for docker image.",
         )
 
         parser.add_argument(
@@ -444,7 +440,7 @@ def parse_args(name: str, description: str):  # noqa
         and args.distribution == "dev_no_samples"
         and "ubuntu" not in args.os
     ):
-        parser.error("Distribution dev_no_samples is available only for Ubuntu operation system")
+        parser.error("Distribution dev_no_samples is available only for Ubuntu operating system")
 
     if args.mode == "gen_dockerfile" and args.distribution == "base":
         parser.error(
@@ -454,7 +450,7 @@ def parse_args(name: str, description: str):  # noqa
 
     if args.mode == "test" and not (args.tags and args.distribution):
         parser.error(
-            "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18'"
+            "Options --tags and --distribution are mandatory. Image operating system is 'ubuntu22'"
             " by default."
         )
 
@@ -539,7 +535,7 @@ def parse_args(name: str, description: str):  # noqa
         if not args.device and "win" not in args.os:
             if args.distribution == "base":
                 args.device = ["cpu"]
-            elif args.os in ("rhel8", "ubuntu18", "ubuntu20"):
+            elif args.os in ("rhel8",):
                 args.device = ["cpu", "gpu"]
             else:
                 args.device = ["cpu", "gpu", "npu"]
diff --git a/utils/builder.py b/utils/builder.py
index 362d345e..7fedb85b 100644
--- a/utils/builder.py
+++ b/utils/builder.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Module handling Docker image building"""
 import logging
diff --git a/utils/docker_api.py b/utils/docker_api.py
index e7889f29..8023ae7d 100644
--- a/utils/docker_api.py
+++ b/utils/docker_api.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Module for handling connection with Docker daemon/service"""
 import logging
diff --git a/utils/exceptions.py b/utils/exceptions.py
index 895bbb27..7346d566 100644
--- a/utils/exceptions.py
+++ b/utils/exceptions.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Custom exceptions for this framework"""
 
diff --git a/utils/loader.py b/utils/loader.py
index d088fcd1..16586f3d 100644
--- a/utils/loader.py
+++ b/utils/loader.py
@@ -1,386 +1,11 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Auxiliary structure for simplifying build process
 
 Supports released/supported versions of product/its dependencies
 """
 INTEL_OPENVINO_VERSION = {
-    '2020.1': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.1/'
-                       'w_openvino_toolkit_dev_p_2020.1.033.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.1/'
-                           'w_openvino_toolkit_runtime_p_2020.1.033.zip',
-            },
-        'ubuntu18':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.1/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.1.023.tgz',
-            },
-    },
-    '2020.2': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                       'w_openvino_toolkit_dev_p_2020.2.117.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                           'w_openvino_toolkit_runtime_p_2020.2.117.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                            'w_openvino_toolkit_data_dev_p_2020.2.117.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2020.2.120.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.2.120.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.2/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2020.2.120.tgz',
-            },
-    },
-    '2020.3': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                       'w_openvino_toolkit_dev_p_2020.3.194.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                           'w_openvino_toolkit_runtime_p_2020.3.194.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                            'w_openvino_toolkit_data_dev_p_2020.3.194.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2020.3.194.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.3.194.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2020.3.194.tgz',
-            },
-    },
-    '2020.3.1': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                       'w_openvino_toolkit_dev_p_2020.3.341.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                           'w_openvino_toolkit_runtime_p_2020.3.341.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                            'w_openvino_toolkit_data_dev_p_2020.3.341.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2020.3.341.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.3.341.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.1/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2020.3.341.tgz',
-            },
-    },
-    '2020.3.2': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                       'w_openvino_toolkit_dev_p_2020.3.355.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                           'w_openvino_toolkit_runtime_p_2020.3.355.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                            'w_openvino_toolkit_data_dev_p_2020.3.355.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2020.3.355.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.3.355.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2020.3.355.tgz',
-            },
-        'centos7':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.3.2/'
-                           'l_openvino_toolkit_runtime_centos7_p_2020.3.355.tgz',
-            },
-    },
-    '2020.4': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                       'w_openvino_toolkit_dev_p_2020.4.287.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                           'w_openvino_toolkit_runtime_p_2020.4.287.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                            'w_openvino_toolkit_data_dev_p_2020.4.287.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2020.4.287.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2020.4.287.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2020.4/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2020.4.287.tgz',
-            },
-    },
-    '2021.1': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                       'w_openvino_toolkit_dev_p_2021.1.110.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                           'w_openvino_toolkit_runtime_p_2021.1.110.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                            'w_openvino_toolkit_data_dev_p_2021.1.110.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2021.1.110.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2021.1.110.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2021.1.110.tgz',
-            },
-        'ubuntu20':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                           'l_openvino_toolkit_runtime_ubuntu20_p_2021.1.110.tgz',
-            },
-        'centos7':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.1/'
-                           'l_openvino_toolkit_runtime_centos7_p_2021.1.110.tgz',
-            },
-    },
-    '2021.2': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                       'w_openvino_toolkit_dev_p_2021.2.185.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                           'w_openvino_toolkit_runtime_p_2021.2.185.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                            'w_openvino_toolkit_data_dev_p_2021.2.185.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2021.2.185.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2021.2.185.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2021.2.185.tgz',
-            },
-        'ubuntu20':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                           'l_openvino_toolkit_runtime_ubuntu20_p_2021.2.185.tgz',
-            },
-        'centos7':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                           'l_openvino_toolkit_runtime_centos7_p_2021.2.185.tgz',
-            },
-        'rhel8':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.2/'
-                           'l_openvino_toolkit_runtime_rhel8_p_2021.2.185.tgz',
-            },
-    },
-    '2021.3': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                       'w_openvino_toolkit_dev_p_2021.3.394.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                           'w_openvino_toolkit_runtime_p_2021.3.394.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                            'w_openvino_toolkit_data_dev_p_2021.3.394.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2021.3.394.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2021.3.394.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2021.3.394.tgz',
-            },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                       'l_openvino_toolkit_dev_ubuntu20_p_2021.3.394.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                           'l_openvino_toolkit_runtime_ubuntu20_p_2021.3.394.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                            'l_openvino_toolkit_data_dev_ubuntu20_p_2021.3.394.tgz',
-            },
-        'centos7':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                           'l_openvino_toolkit_runtime_centos7_p_2021.3.394.tgz',
-            },
-        'rhel8':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.3/'
-                           'l_openvino_toolkit_runtime_rhel8_p_2021.3.394.tgz',
-            },
-    },
-    '2021.4': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                       'w_openvino_toolkit_dev_p_2021.4.582.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                           'w_openvino_toolkit_runtime_p_2021.4.582.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                            'w_openvino_toolkit_data_dev_p_2021.4.582.zip',
-            },
-        'windows20h2':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                       'w_openvino_toolkit_dev_p_2021.4.582.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                           'w_openvino_toolkit_runtime_p_2021.4.582.zip',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                            'w_openvino_toolkit_data_dev_p_2021.4.582.zip',
-            },
-        'ubuntu18':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2021.4.582.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                            'l_openvino_toolkit_data_dev_ubuntu18_p_2021.4.582.tgz',
-            },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                       'l_openvino_toolkit_dev_ubuntu20_p_2021.4.582.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                           'l_openvino_toolkit_runtime_ubuntu20_p_2021.4.582.tgz',
-                'data_dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                            'l_openvino_toolkit_data_dev_ubuntu20_p_2021.4.582.tgz',
-            },
-        'rhel8':
-            {
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2021.4/'
-                           'l_openvino_toolkit_runtime_rhel8_p_2021.4.582.tgz',
-            },
-    },
-    '2022.1.0': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                       'w_openvino_toolkit_dev_p_2022.1.0.643.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                           'w_openvino_toolkit_runtime_p_2022.1.0.643.zip',
-            },
-        'windows20h2':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                       'w_openvino_toolkit_dev_p_2022.1.0.643.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                           'w_openvino_toolkit_runtime_p_2022.1.0.643.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                       'l_openvino_toolkit_dev_ubuntu18_p_2022.1.0.643.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                           'l_openvino_toolkit_runtime_ubuntu18_p_2022.1.0.643.tgz',
-            },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                       'l_openvino_toolkit_dev_ubuntu20_p_2022.1.0.643.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                           'l_openvino_toolkit_runtime_ubuntu20_p_2022.1.0.643.tgz',
-            },
-        'rhel8':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                       'l_openvino_toolkit_dev_rhel8_p_2022.1.0.643.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.1/'
-                           'l_openvino_toolkit_runtime_rhel8_p_2022.1.0.643.tgz',
-            },
-    },
-    '2022.2.0': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                       'windows/w_openvino_toolkit_windows_2022.2.0.7713.af16ea1d79a_x86_64.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                           'windows/w_openvino_toolkit_windows_2022.2.0.7713.af16ea1d79a_x86_64.zip',
-            },
-        'windows20h2':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                       'windows/w_openvino_toolkit_windows_2022.2.0.7713.af16ea1d79a_x86_64.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                           'windows/w_openvino_toolkit_windows_2022.2.0.7713.af16ea1d79a_x86_64.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                       'linux/l_openvino_toolkit_ubuntu18_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                           'linux/l_openvino_toolkit_ubuntu18_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-            },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                       'linux/l_openvino_toolkit_ubuntu20_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                           'linux/l_openvino_toolkit_ubuntu20_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-            },
-        'rhel8':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                       'linux/l_openvino_toolkit_rhel8_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.2/'
-                           'linux/l_openvino_toolkit_rhel8_2022.2.0.7713.af16ea1d79a_x86_64.tgz',
-            },
-    },
-    '2022.3.0': {
-        'winserver2019':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                       'windows/w_openvino_toolkit_windows_2022.3.0.9052.9752fafe8eb_x86_64.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                           'windows/w_openvino_toolkit_windows_2022.3.0.9052.9752fafe8eb_x86_64.zip',
-            },
-        'windows20h2':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                       'windows/w_openvino_toolkit_windows_2022.3.0.9052.9752fafe8eb_x86_64.zip',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                           'windows/w_openvino_toolkit_windows_2022.3.0.9052.9752fafe8eb_x86_64.zip',
-            },
-        'ubuntu18':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                       'linux/l_openvino_toolkit_ubuntu18_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                           'linux/l_openvino_toolkit_ubuntu18_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-            },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                       'linux/l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                           'linux/l_openvino_toolkit_ubuntu20_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-            },
-        'rhel8':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                       'linux/l_openvino_toolkit_rhel8_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2022.3/'
-                           'linux/l_openvino_toolkit_rhel8_2022.3.0.9052.9752fafe8eb_x86_64.tgz',
-            },
-    },
     '2023.0.0': {
         'ubuntu22':
             {
@@ -389,13 +14,6 @@
                 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/'
                            'linux/l_openvino_toolkit_ubuntu22_2023.0.0.10926.b4452d56304_x86_64.tgz',
             },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/'
-                       'linux/l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/'
-                           'linux/l_openvino_toolkit_ubuntu20_2023.0.0.10926.b4452d56304_x86_64.tgz',
-            },
         'rhel8':
             {
                 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.0/'
@@ -412,13 +30,6 @@
                 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/'
                            'linux/l_openvino_toolkit_ubuntu22_2023.2.0.13089.cfd42bd2cb0_x86_64.tgz',
             },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/'
-                       'linux/l_openvino_toolkit_ubuntu20_2023.2.0.13089.cfd42bd2cb0_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/'
-                           'linux/l_openvino_toolkit_ubuntu20_2023.2.0.13089.cfd42bd2cb0_x86_64.tgz',
-            },
         'rhel8':
             {
                 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.2/'
@@ -435,13 +46,6 @@
                 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/'
                            'linux/l_openvino_toolkit_ubuntu22_2023.3.0.13775.ceeafaf64f3_x86_64.tgz',
             },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/'
-                       'linux/l_openvino_toolkit_ubuntu20_2023.3.0.13775.ceeafaf64f3_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/'
-                           'linux/l_openvino_toolkit_ubuntu20_2023.3.0.13775.ceeafaf64f3_x86_64.tgz',
-            },
         'rhel8':
             {
                 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2023.3/'
@@ -458,13 +62,6 @@
                 'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.0/'
                            'linux/l_openvino_toolkit_ubuntu22_2024.0.0.14509.34caeefd078_x86_64.tgz',
             },
-        'ubuntu20':
-            {
-                'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.0/'
-                       'linux/l_openvino_toolkit_ubuntu20_2024.0.0.14509.34caeefd078_x86_64.tgz',
-                'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.0/'
-                           'linux/l_openvino_toolkit_ubuntu20_2024.0.0.14509.34caeefd078_x86_64.tgz',
-            },
         'rhel8':
             {
                 'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.0/'
@@ -480,12 +77,6 @@
             'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/'
                    'linux/l_openvino_toolkit_ubuntu22_2024.1.0.15008.f4afc983258_x86_64.tgz',
         },
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/'
-                   'linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/'
-                   'linux/l_openvino_toolkit_ubuntu20_2024.1.0.15008.f4afc983258_x86_64.tgz',
-        },
         'rhel8': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.1/'
                    'linux/l_openvino_toolkit_rhel8_2024.1.0.15008.f4afc983258_x86_64.tgz',
@@ -494,12 +85,6 @@
         },
     },
     '2024.2.0': {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.2/'
-                   'linux/l_openvino_toolkit_ubuntu20_2024.2.0.15519.5c0f38f83f6_x86_64.tgz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.2/'
-                       'linux/l_openvino_toolkit_ubuntu20_2024.2.0.15519.5c0f38f83f6_x86_64.tgz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.2/'
                    'linux/l_openvino_toolkit_ubuntu22_2024.2.0.15519.5c0f38f83f6_x86_64.tgz',
@@ -514,12 +99,6 @@
         },
     },
     '2024.3.0': {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.3/linux/'
-                   'l_openvino_toolkit_ubuntu20_2024.3.0.16041.1e3b88e4e3f_x86_64.tgz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.3/linux/'
-                       'l_openvino_toolkit_ubuntu20_2024.3.0.16041.1e3b88e4e3f_x86_64.tgz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.3/linux/'
                    'l_openvino_toolkit_ubuntu22_2024.3.0.16041.1e3b88e4e3f_x86_64.tgz',
@@ -534,12 +113,6 @@
         },
     },
     '2024.4.0': {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                   '2024.4/linux/openvino_genai_ubuntu20_2024.4.0.0_x86_64.tar.gz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                       '2024.4/linux/openvino_genai_ubuntu20_2024.4.0.0_x86_64.tar.gz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
                    '2024.4/linux/openvino_genai_ubuntu22_2024.4.0.0_x86_64.tar.gz',
@@ -554,12 +127,6 @@
         },
     },
     '2024.5.0': {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                   '2024.5/linux/openvino_genai_ubuntu20_2024.5.0.0_x86_64.tar.gz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                       '2024.5/linux/openvino_genai_ubuntu20_2024.5.0.0_x86_64.tar.gz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
                    '2024.5/linux/openvino_genai_ubuntu22_2024.5.0.0_x86_64.tar.gz',
@@ -580,12 +147,6 @@
         },
     },
     '2024.6.0': {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                   '2024.6/linux/openvino_genai_ubuntu20_2024.6.0.0_x86_64.tar.gz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                       '2024.6/linux/openvino_genai_ubuntu20_2024.6.0.0_x86_64.tar.gz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
                    '2024.6/linux/openvino_genai_ubuntu22_2024.6.0.0_x86_64.tar.gz',
@@ -606,12 +167,6 @@
         },
     },
     "2025.0.0": {
-        'ubuntu20': {
-            'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                   '2025.0/linux/openvino_genai_ubuntu20_2025.0.0.0_x86_64.tar.gz',
-            'runtime': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
-                       '2025.0/linux/openvino_genai_ubuntu20_2025.0.0.0_x86_64.tar.gz',
-        },
         'ubuntu22': {
             'dev': 'https://storage.openvinotoolkit.org/repositories/openvino_genai/packages/'
                    '2025.0/linux/openvino_genai_ubuntu22_2025.0.0.0_x86_64.tar.gz',
diff --git a/utils/logger.py b/utils/logger.py
index 6090f264..f33f23a1 100644
--- a/utils/logger.py
+++ b/utils/logger.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Custom logger for this framework based on logging package from standard Python library"""
 import inspect
diff --git a/utils/render.py b/utils/render.py
index c3fb1208..91a0196a 100644
--- a/utils/render.py
+++ b/utils/render.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Module handling Dockerfile generating"""
 import argparse
diff --git a/utils/tester.py b/utils/tester.py
index e553cab6..50d841df 100644
--- a/utils/tester.py
+++ b/utils/tester.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Module that handles running tests on Docker image"""
 import logging
diff --git a/utils/tests/test_arg_parser.py b/utils/tests/test_arg_parser.py
index 829c8fd4..fa5e6dbc 100644
--- a/utils/tests/test_arg_parser.py
+++ b/utils/tests/test_arg_parser.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 import argparse
 import pathlib
@@ -23,7 +23,7 @@
     'msbuild': None,
     'pre_stage_msbuild': None,
     'rhel_platform': 'docker',
-    'os': 'ubuntu18',
+    'os': 'ubuntu22',
     'package_url': None,
     'product_version': None,
     'python': None,
@@ -93,42 +93,6 @@
         },
         id='check tag postfix',
     ),
-    # pytest.param(
-    #     {
-    #         'mode': 'build',
-    #         'package_url': 'openvino_dev_p_2022.1.0.320.zip',
-    #         'source': 'local',
-    #         'os': 'winserver2019',
-    #         'pre_stage_msbuild': 'msbuild2019_online',
-    #     },
-    #     {
-    #         'device': ['cpu'],
-    #         'dockerfile_name': 'openvino_c_dev_2022.1.0.dockerfile',
-    #         'python': 'python310',
-    #         'tags': ['winserver2019_dev:2022.1.0.320', 'winserver2019_dev:latest'],
-    #         'distribution': 'dev',
-    #         'product_version': '2022.1.0',
-    #     },
-    #     id='winserver2019',
-    # ),
-    # pytest.param(
-    #     {
-    #         'mode': 'build',
-    #         'package_url': 'openvino_dev_p_2022.1.0.320.zip',
-    #         'distribution': 'base',
-    #         'file': 'openvino_c_base_2022.1.dockerfile',
-    #         'source': 'local',
-    #     },
-    #     {
-    #         'device': ['cpu'],
-    #         'dockerfile_name': 'openvino_c_base_2022.1.0.dockerfile',
-    #         'python': 'python310',
-    #         'tags': ['ubuntu18_base_cpu:2022.1.0', 'ubuntu18_base_cpu:latest'],
-    #         'distribution': 'base',
-    #         'product_version': '2022.1.0',
-    #     },
-    #     id='ubuntu base',
-    # ),
     pytest.param(
         {
             'mode': 'build',
@@ -398,7 +362,7 @@ def test_arg_parser_success(mock_exists, mock_parser, args, res):
             'distribution': 'dev',
             'test_expression': 'cpu',
         },
-        "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18' by default.",
+        "Options --tags and --distribution are mandatory. Image operating system is 'ubuntu22' by default.",
         id='Test without --tags',
     ),
     pytest.param(
@@ -407,7 +371,7 @@ def test_arg_parser_success(mock_exists, mock_parser, args, res):
             'test_expression': 'cpu',
             'tags': ['test:latest'],
         },
-        "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18' by default.",
+        "Options --tags and --distribution are mandatory. Image operating system is 'ubuntu22' by default.",
         id='Test without --distribution',
     ),
     pytest.param(
diff --git a/utils/utilities.py b/utils/utilities.py
index 5fa8782e..5c100839 100644
--- a/utils/utilities.py
+++ b/utils/utilities.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2026 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 """Module handling auxiliary functions for the framework"""
 import contextlib