diff --git a/classical-ml/Dockerfile b/classical-ml/Dockerfile
index bd145889..180c6d62 100644
--- a/classical-ml/Dockerfile
+++ b/classical-ml/Dockerfile
@@ -36,11 +36,11 @@ RUN python -m pip install --no-cache-dir \
 COPY base/.patch_sklearn.py ${HOME}/.patch_sklearn.py
 
 RUN mkdir -p /licensing && \
-	wget --progress=dot:giga -O - https://github.com/intel/scikit-learn-intelex/archive/refs/tags/${SCIKIT_VERSION}.tar.gz | \
-	tar -xz -C /licensing --strip=2 "scikit-learn-intelex-${SCIKIT_VERSION}/doc/third-party-programs-sklearnex.txt" \
-	"scikit-learn-intelex-${SCIKIT_VERSION}/doc/daal4py/third-party-programs.txt"
+    wget --progress=dot:giga -O - "https://github.com/intel/scikit-learn-intelex/archive/refs/heads/main.tar.gz" | \
+    tar -xz -C /licensing --strip=2 "scikit-learn-intelex-main/doc/third-party-programs-sklearnex.txt" \
+    "scikit-learn-intelex-main/doc/daal4py/third-party-programs.txt"
 
-RUN wget --progress=dot:giga --no-check-certificate https://raw.githubusercontent.com/intel/scikit-learn-intelex/${SCIKIT_VERSION}/LICENSE -O /licensing/SCIKIT_LICENSE
+RUN wget --progress=dot:giga --no-check-certificate "https://raw.githubusercontent.com/intel/scikit-learn-intelex/main/LICENSE" -O /licensing/SCIKIT_LICENSE
 
 FROM ${COMPOSE_PROJECT_NAME}-python AS ml-base-idp
 
@@ -63,10 +63,11 @@ ENV PYTHONSTARTUP=${HOME}/.patch_sklearn.py
 COPY base/.patch_sklearn.py ${HOME}/.patch_sklearn.py
 
 RUN mkdir -p /licensing && \
-	wget --progress=dot:giga -O - https://github.com/intel/scikit-learn-intelex/archive/refs/tags/${SCIKIT_VERSION}.tar.gz | \
-	tar -xz -C /licensing --strip=2 "scikit-learn-intelex-${SCIKIT_VERSION}/doc/third-party-programs-sklearnex.txt" \
-	"scikit-learn-intelex-${SCIKIT_VERSION}/doc/daal4py/third-party-programs.txt" && \
-    wget --progress=dot:giga --no-check-certificate https://raw.githubusercontent.com/intel/scikit-learn-intelex/${SCIKIT_VERSION}/LICENSE -O /licensing/SCIKIT_LICENSE
+    wget --progress=dot:giga -O - "https://github.com/intel/scikit-learn-intelex/archive/refs/heads/main.tar.gz" | \
+    tar -xz -C /licensing --strip=2 "scikit-learn-intelex-main/doc/third-party-programs-sklearnex.txt" \
+    "scikit-learn-intelex-main/doc/daal4py/third-party-programs.txt"
+
+RUN wget --progress=dot:giga --no-check-certificate "https://raw.githubusercontent.com/intel/scikit-learn-intelex/main/LICENSE" -O /licensing/SCIKIT_LICENSE
 
 FROM ml-base-${PACKAGE_OPTION} AS jupyter
 
diff --git a/classical-ml/README.md b/classical-ml/README.md
index b343c38b..16b71e58 100644
--- a/classical-ml/README.md
+++ b/classical-ml/README.md
@@ -12,8 +12,8 @@
 | MINICONDA_VERSION | `latest-Linux-x86_64` | Miniconda Version from `https://repo.anaconda.com/miniconda` |
 | PACKAGE_OPTION | `pip` | Stock Python (pypi) or Intel Python (conda) (`pip` or `idp`) |
 | PYTHON_VERSION | `3.10` | Python Version |
-| SCIKIT_VERSION | `2024.0.0` | Intel SKLearn Version |
-| XGBOOST_VERSION | `2.0.2` | XGBoost Version |
+| SCIKIT_VERSION | `2024.2.0` | Intel SKLearn Version |
+| XGBOOST_VERSION | `2.0.3` | XGBoost Version |
 
 ### Jupyter
 
diff --git a/classical-ml/docker-compose.yaml b/classical-ml/docker-compose.yaml
index 8fd0ce95..87aaf6b1 100644
--- a/classical-ml/docker-compose.yaml
+++ b/classical-ml/docker-compose.yaml
@@ -21,8 +21,8 @@ services:
         no_proxy: ${no_proxy}
         COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-classical-ml}
         PACKAGE_OPTION: ${PACKAGE_OPTION:-pip}
-        SCIKIT_VERSION: ${SCIKIT_VERSION:-2024.0.0}
-        XGBOOST_VERSION: ${XGBOOST_VERSION:-2.0.2}
+        SCIKIT_VERSION: ${SCIKIT_VERSION:-2024.2.0}
+        XGBOOST_VERSION: ${XGBOOST_VERSION:-2.0.3}
       context: .
       dockerfile: Dockerfile
       target: ml-base-${PACKAGE_OPTION:-pip}
@@ -31,7 +31,7 @@ services:
       - python
     command: >
       bash -c "python -c 'import sklearnex, sklearn; import xgboost as xgb; print(\"Scikit version:\", sklearn.__version__, \"\\nXGBoost version:\", xgb.__version__)'"
-    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
+    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
     pull_policy: always
 
   jupyter:
@@ -43,5 +43,5 @@ services:
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
     extends: ml-base
-    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-jupyter
+    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-jupyter
     network_mode: host
diff --git a/classical-ml/tests/tests.yaml b/classical-ml/tests/tests.yaml
index 09589cfa..05603157 100644
--- a/classical-ml/tests/tests.yaml
+++ b/classical-ml/tests/tests.yaml
@@ -1,24 +1,12 @@
 ---
-classical-ml-base-idp-sklearn:
-  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-idp-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
+classical-ml-base-${PACKAGE_OPTION:-pip}-sklearn:
+  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
   cmd: bash /tests/sklearn.sh
   volumes:
     - src: $PWD/classical-ml/tests
       dst: /tests
-classical-ml-base-idp-xgboost:
-  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-idp-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
-  cmd: bash /tests/xgboost.sh
-  volumes:
-    - src: $PWD/classical-ml/tests
-      dst: /tests
-classical-ml-base-pip-sklearn:
-  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
-  cmd: bash /tests/sklearn.sh
-  volumes:
-    - src: $PWD/classical-ml/tests
-      dst: /tests
-classical-ml-base-pip-xgboost:
-  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.0.0}-xgboost-${XGBOOST_VERSION:-2.0.2}-base
+classical-ml-base-${PACKAGE_OPTION:-pip}-xgboost:
+  img: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-scikit-learn-${SCIKIT_VERSION:-2024.2.0}-xgboost-${XGBOOST_VERSION:-2.0.3}-base
   cmd: bash /tests/xgboost.sh
   volumes:
     - src: $PWD/classical-ml/tests