diff --git a/.github/workflows/build_and_run.yml b/.github/workflows/build_and_run.yml
index 34da48cf..39c5591f 100644
--- a/.github/workflows/build_and_run.yml
+++ b/.github/workflows/build_and_run.yml
@@ -106,10 +106,10 @@ jobs:
       # TODO: remove it once it is removed from hard dependency. Not presented
       # in conda-forge version, but there are some blockers before we could use
       # it.
-      - name: Remove vs env
-        if: runner.os == 'Windows' && matrix.sycl == 'sycl'
-        run: |
-          conda remove --force vs2017_win-64
+      # - name: Remove vs env
+      #   if: runner.os == 'Windows' && matrix.sycl == 'sycl'
+      #   run: |
+      #     conda remove --force vs2017_win-64
 
       # Github pre-installed versions:
       # https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md
@@ -139,9 +139,9 @@ jobs:
         run: |
           echo "CMAKE_GENERATOR=Ninja" >> "$GITHUB_ENV"
 
-      - name: Configure OneAPI
-        run: |
-          echo "ONEAPI_DEVICE_SELECTOR=opencl:cpu" >> "$GITHUB_ENV"
+      # - name: Configure OneAPI
+      #   run: |
+      #     echo "ONEAPI_DEVICE_SELECTOR=opencl:cpu" >> "$GITHUB_ENV"
 
       - name: Populate conda environment paths
         shell: pwsh
@@ -166,14 +166,23 @@ jobs:
           # Turn off numba-dpex autofall back
           echo "NUMBA_DPEX_FALLBACK_ON_CPU=0" >> "GITHUB_ENV"
 
+      # $script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
+      # &$script_path
       - name: Setup OpenCL CPU device
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          $script_path="$env:CONDA_PREFIX\Scripts\set-intel-ocl-icd-registry.ps1"
-          &$script_path
           echo "OCL_ICD_FILENAMES=$env:CONDA_PREFIX\Library\lib\intelocl64.dll" >> $env:GITHUB_ENV
 
+      - name: Check DPCTL
+        run: |
+          python -c "import dpctl; dpctl.lsplatform()"
+
+      - name: Check SYCL
+        if: matrix.sycl == 'sycl'
+        run: |
+          sycl-ls
+
       - name: Run benchmarks
         run: dpbench -i ${{env.WORKLOADS}} run -r2 --no-print-results --precision=${{matrix.precision}} || exit 1
 
diff --git a/environments/conda-linux-sycl.yml b/environments/conda-linux-sycl.yml
index 504bb51f..970fca03 100644
--- a/environments/conda-linux-sycl.yml
+++ b/environments/conda-linux-sycl.yml
@@ -25,8 +25,8 @@ dependencies:
   - numba-dpex
   - numba-mlir
   # TODO: fix issues on conda-forge build
-  - intel::dpcpp_linux-64
-  - intel::dpcpp-cpp-rt
+  - conda-forge::dpcpp_linux-64
+  - conda-forge::dpcpp-cpp-rt
   - cython
   - cmake
   - ninja
diff --git a/environments/conda-win-sycl.yml b/environments/conda-win-sycl.yml
index 38be60f7..9f1ba9cb 100644
--- a/environments/conda-win-sycl.yml
+++ b/environments/conda-win-sycl.yml
@@ -25,16 +25,16 @@ dependencies:
   - numba-dpex
   - numba-mlir
   # TODO: switch to conda-forge, but it results in broken OpenCL rt (see below)
-  # - conda-forge::dpcpp_win-64
-  - intel::dpcpp_win-64
+  - conda-forge::dpcpp_win-64
+  # - intel::dpcpp_win-64
   # fixing cmake version here, because we need to apply patch for IntelLLVM
   - cmake==3.26*
   - cython
   - scikit-build
   # TODO: switch to khronos, sycl-ls works fine, but dpctl can't select device.
   # set's OpenCL runtime (better version of intel-opencl-rt)
-  # - khronos-opencl-icd-loader
-  - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
+  - khronos-opencl-icd-loader
+  # - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
   # https://github.com/scikit-build/scikit-build/issues/981
   - setuptools>=42,<64
   - pybind11
diff --git a/environments/conda.yml b/environments/conda.yml
index 52be1fce..a357374a 100644
--- a/environments/conda.yml
+++ b/environments/conda.yml
@@ -18,7 +18,8 @@ dependencies:
   - scikit-learn
   - versioneer
   - pandas
-  - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
+  # - intel::intel-opencl-rt # need for set-intel-ocl-icd-registry.ps1
+  # - khronos-opencl-icd-loader
   - intel::numpy
   - numba
   - dpctl