diff --git a/.github/workflows/smoke-test-pr-check.yaml b/.github/workflows/smoke-test-pr-check.yaml
index ad9a27bd6e3..691f785b9be 100644
--- a/.github/workflows/smoke-test-pr-check.yaml
+++ b/.github/workflows/smoke-test-pr-check.yaml
@@ -26,54 +26,6 @@ jobs:
   smoke-test:
     runs-on: ubuntu-22.04
     steps:
-
-      - name: Checkout che-code source code
-        uses: actions/checkout@v4
-
-      - name: Prepare Che-Code Dockerfile ( remove tests )
-        run: |
-          #
-          # truncate Dockerfile, remove section that runs tests
-          #
-          cp -f build/dockerfiles/linux-libc-ubi9.Dockerfile build/dockerfiles/linux-libc-ubi9.no-test.Dockerfile
-          REMOVE_FROM="### Beginning of tests"
-          REMOVE_TO="### Ending of tests"
-          sed -i "/${REMOVE_FROM}/,/${REMOVE_TO}/{/${REMOVE_FROM}/n;/${REMOVE_TO}/!d;}" build/dockerfiles/linux-libc-ubi9.no-test.Dockerfile
-
-          #
-          # show the Dockerfile
-          #
-          cat build/dockerfiles/linux-libc-ubi9.no-test.Dockerfile
-
-      - name: Compile Che-Code editor
-        run: |
-          #
-          # build linux-libc-ubi9:latest docker image
-          #
-          docker image prune -a -f
-          docker build --memory-swap -1 --memory 12g -f build/dockerfiles/linux-libc-ubi9.no-test.Dockerfile -t linux-libc-ubi9 .
-
-      - name: Build Che-Code Docker image
-        run: |
-          #
-          # build che-code:latest docker image
-          #
-          cp -f build/dockerfiles/assembly.Dockerfile build/dockerfiles/assembly.copy.Dockerfile
-          REPLACE_FROM="FROM linux-musl as linux-musl-content"
-          sed -i -r -e "s|${REPLACE_FROM}||" build/dockerfiles/assembly.copy.Dockerfile
-          REPLACE_FROM="COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl"
-          sed -i -r -e "s|${REPLACE_FROM}||" build/dockerfiles/assembly.copy.Dockerfile
-          REPLACE_FROM="FROM linux-libc-ubi8 as linux-libc-ubi8-content"
-          sed -i -r -e "s|${REPLACE_FROM}||" build/dockerfiles/assembly.copy.Dockerfile
-          REPLACE_FROM="COPY --from=linux-libc-ubi8-content --chown=0:0 /checode-linux-libc/ubi8 /mnt/rootfs/checode-linux-libc/ubi8"
-          sed -i -r -e "s|${REPLACE_FROM}||" build/dockerfiles/assembly.copy.Dockerfile
-          
-          export DOCKER_BUILDKIT=1
-          docker build -f build/dockerfiles/assembly.copy.Dockerfile -t che-code .
-
-          docker tag che-code:latest che-code:next
-          docker save -o /tmp/che-code-latest.tar che-code:latest che-code:next
-
       - name: Display docker images
         run: |
           docker images
@@ -102,11 +54,6 @@ jobs:
 
       - name: Deploy Che
         run: |
-          #
-          # load che-code images from /tmp/che-code-latest.tar
-          #
-          eval $(minikube docker-env) && docker load -i  /tmp/che-code-latest.tar && rm /tmp/che-code-latest.tar
-
           #
           # deploy Che
           #
@@ -115,7 +62,6 @@ jobs:
             --platform minikube \
             --k8spodwaittimeout=480000 \
             --k8spodreadytimeout=480000 \
-            --che-operator-cr-patch-yaml "${GITHUB_WORKSPACE}/build/test/github-minikube-checluster-patch.yaml"
 
           #
           # apply patch
@@ -128,7 +74,7 @@ jobs:
       - name: Pull Universal Base Image
         run: |
           minikube image pull quay.io/devfile/universal-developer-image:ubi9-latest
-
+          
       - name: Run Smoke test
         run: |
           docker run \
@@ -148,11 +94,11 @@ jobs:
             -e TS_SELENIUM_LOG_LEVEL=TRACE \
             -e TS_WAIT_LOADER_PRESENCE_TIMEOUT=120000 \
             -e TS_COMMON_DASHBOARD_WAIT_TIMEOUT=30000 \
-            -v ${LOCAL_TEST_DIR}/tests/e2e/report:/tmp/e2e/report:Z \
-            -v ${LOCAL_TEST_DIR}/tests/e2e/video:/tmp/ffmpeg_report:Z \
+            -v ${LOCAL_TEST_DIR}/che/tests/e2e/report:/tmp/e2e/report:Z \
+            -v ${LOCAL_TEST_DIR}/che/tests/e2e/video:/tmp/ffmpeg_report:Z \
             -e USERSTORY=SmokeTest \
             -e TS_SELENIUM_VALUE_OPENSHIFT_OAUTH=false \
-            -e TS_SELENIUM_FACTORY_GIT_REPO_URL=https://github.com/che-incubator/quarkus-api-example?df=smoke-test.devfile.yaml \
+            -e TS_SELENIUM_FACTORY_GIT_REPO_URL=https://github.com/che-incubator/quarkus-api-example \
             quay.io/eclipse/che-e2e:next
 
       - name: Bump logs
@@ -177,7 +123,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: e2e-artifacts
-          path: /tmp/tests
+          path: /tmp/che/tests
       
       - name: Store k8s logs
         if: always()