diff --git a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
index 7c9536f6a..411c5b4ae 100644
--- a/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
+++ b/ods_ci/tests/Resources/Page/DistributedWorkloads/DistributedWorkloads.resource
@@ -6,13 +6,21 @@ Library          Process
 
 *** Variables ***
 ${VIRTUAL_ENV_NAME}                      venv3.9
-${CODEFLARE-SDK-RELEASE-TAG}             v0.19.1
+${CODEFLARE-SDK-API_URL}                 %{CODEFLARE-SDK-API_URL=https://api.github.com/repos/project-codeflare/codeflare-sdk/releases/173851082}
 ${CODEFLARE-SDK_DIR}                     codeflare-sdk
 ${CODEFLARE-SDK_REPO_URL}                %{CODEFLARE-SDK_REPO_URL=https://github.com/project-codeflare/codeflare-sdk.git}
 ${DISTRIBUTED_WORKLOADS_RELEASE_ASSETS}  https://github.com/opendatahub-io/distributed-workloads/releases/download/v2.13.1
+${RAY_IMAGE}                             quay.io/rhoai/ray@sha256:859f5c41d41bad1935bce455ad3732dff9d4d4c342b7155a7cd23809e85698ab
 ${FMS_HF_TUNING_IMAGE}                   quay.io/modh/fms-hf-tuning@sha256:eee08ba5bb14ead4e031408fcb2334d8da817dec3be7df8d2fc8b1a3d3bb9c1d
 ${KFTO_CORE_BINARY_NAME}                 kfto
 ${KFTO_UPGRADE_BINARY_NAME}              kfto-upgrade
+${PIP_INDEX_URL}                         ${PIP_INDEX_URL}
+${PIP_TRUSTED_HOST}                      ${PIP_TRUSTED_HOST}
+${AWS_DEFAULT_ENDPOINT}                  ${S3.BUCKET_5.ENDPOINT}
+${AWS_STORAGE_BUCKET}                    ${S3.BUCKET_5.NAME}
+${AWS_ACCESS_KEY_ID}                     ${S3.AWS_ACCESS_KEY_ID}
+${AWS_SECRET_ACCESS_KEY}                 ${S3.AWS_SECRET_ACCESS_KEY}
+${AWS_STORAGE_BUCKET_MNIST_DIR}          mnist-datasets
 
 
 *** Keywords ***
@@ -46,6 +54,14 @@ Run Codeflare-SDK Test
     [Arguments]    ${TEST_TYPE}    ${TEST_NAME}
     Log To Console    "Running codeflare-sdk test: ${TEST_NAME}"
     ${result} =    Run Process  source ${VIRTUAL_ENV_NAME}/bin/activate && cd ${CODEFLARE-SDK_DIR} && poetry env use 3.9 && poetry install --with test,docs && poetry run pytest -v -s ./tests/${TEST_TYPE}/${TEST_NAME} --timeout\=300 && deactivate
+    ...    env:RAY_IMAGE=${RAY_IMAGE}
+    ...    env:AWS_DEFAULT_ENDPOINT=${AWS_DEFAULT_ENDPOINT}
+    ...    env:AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+    ...    env:AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+    ...    env:AWS_STORAGE_BUCKET=${AWS_STORAGE_BUCKET}
+    ...    env:AWS_STORAGE_BUCKET_MNIST_DIR=${AWS_STORAGE_BUCKET_MNIST_DIR}
+    ...    env:PIP_INDEX_URL=${PIP_INDEX_URL}
+    ...    env:PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
     ...    shell=true
     ...    stderr=STDOUT
     Log To Console    ${result.stdout}
diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-sdk-e2e-tests.robot b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-sdk-e2e-tests.robot
index c48345e27..b9e0b703e 100644
--- a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-sdk-e2e-tests.robot
+++ b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-sdk-e2e-tests.robot
@@ -29,6 +29,8 @@ Run TestRayLocalInteractiveOauth test
 *** Keywords ***
 Prepare Codeflare-sdk E2E Test Suite
     [Documentation]    Prepare codeflare-sdk E2E Test Suite
+    Log To Console    "Restarting kueue"
+    Restart Kueue
     Prepare Codeflare-SDK Test Setup
     RHOSi Setup
 
@@ -36,4 +38,3 @@ Teardown Codeflare-sdk E2E Test Suite
     [Documentation]    Teardown codeflare-sdk E2E Test Suite
     Cleanup Codeflare-SDK Setup
     RHOSi Teardown
-
diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-tests.robot b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-tests.robot
index 97a90b4a6..1c8398a1e 100644
--- a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-tests.robot
+++ b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-codeflare-tests.robot
@@ -9,10 +9,18 @@ Resource          ../../../tests/Resources/Page/DistributedWorkloads/Distributed
 
 
 *** Variables ***
-${CODEFLARE_RELEASE_ASSETS}     %{CODEFLARE_RELEASE_ASSETS=https://github.com/opendatahub-io/distributed-workloads/releases/download/v2.13.1}
-${NOTEBOOK_IMAGE}               %{NOTEBOOK_IMAGE_STREAM_NAME=quay.io/modh/odh-generic-data-science-notebook@sha256:d81e47fa2f5656042748cf2cd1d97033f58d6dd707667ff0e25aa969959e56a7}
-${NOTEBOOK_USER_NAME}           ${TEST_USER_3.USERNAME}
-${NOTEBOOK_USER_PASSWORD}       ${TEST_USER_3.PASSWORD}
+${CODEFLARE_RELEASE_ASSETS}         %{CODEFLARE_RELEASE_ASSETS=https://github.com/opendatahub-io/distributed-workloads/releases/download/v2.13.1}
+${NOTEBOOK_IMAGE}                   quay.io/modh/odh-generic-data-science-notebook@sha256:d81e47fa2f5656042748cf2cd1d97033f58d6dd707667ff0e25aa969959e56a7
+${NOTEBOOK_USER_NAME}               ${TEST_USER_3.USERNAME}
+${NOTEBOOK_USER_PASSWORD}           ${TEST_USER_3.PASSWORD}
+${CODEFLARE_TEST_RAY_IMAGE}         quay.io/rhoai/ray@sha256:859f5c41d41bad1935bce455ad3732dff9d4d4c342b7155a7cd23809e85698ab
+${PIP_INDEX_URL}                    ${PIP_INDEX_URL}
+${PIP_TRUSTED_HOST}                 ${PIP_TRUSTED_HOST}
+${AWS_DEFAULT_ENDPOINT}             ${S3.BUCKET_5.ENDPOINT}
+${AWS_STORAGE_BUCKET}               ${S3.BUCKET_5.NAME}
+${AWS_ACCESS_KEY_ID}                ${S3.AWS_ACCESS_KEY_ID}
+${AWS_SECRET_ACCESS_KEY}            ${S3.AWS_SECRET_ACCESS_KEY}
+${AWS_STORAGE_BUCKET_MNIST_DIR}     mnist-datasets
 
 
 *** Test Cases ***
@@ -100,10 +108,18 @@ Run Codeflare ODH Test
     ...    env:CODEFLARE_TEST_TIMEOUT_MEDIUM=10m
     ...    env:CODEFLARE_TEST_TIMEOUT_LONG=20m
     ...    env:CODEFLARE_TEST_OUTPUT_DIR=%{WORKSPACE}/codeflare-odh-logs
+    ...    env:CODEFLARE_TEST_RAY_IMAGE=${CODEFLARE_TEST_RAY_IMAGE}
     ...    env:ODH_NAMESPACE=${APPLICATIONS_NAMESPACE}
-    ...    env:NOTEBOOK_IMAGE=${NOTEBOOK_IMAGE}
     ...    env:NOTEBOOK_USER_NAME=${NOTEBOOK_USER_NAME}
     ...    env:NOTEBOOK_USER_TOKEN=${NOTEBOOK_USER_TOKEN}
+    ...    env:NOTEBOOK_IMAGE=${NOTEBOOK_IMAGE}
+    ...    env:AWS_DEFAULT_ENDPOINT=${AWS_DEFAULT_ENDPOINT}
+    ...    env:AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+    ...    env:AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+    ...    env:AWS_STORAGE_BUCKET=${AWS_STORAGE_BUCKET}
+    ...    env:AWS_STORAGE_BUCKET_MNIST_DIR=${AWS_STORAGE_BUCKET_MNIST_DIR}
+    ...    env:PIP_INDEX_URL=${PIP_INDEX_URL}
+    ...    env:PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST}
     Log To Console    ${result.stdout}
     IF    ${result.rc} != 0
         FAIL    ${TEST_NAME} failed
diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-kueue-e2e-tests.robot b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-kueue-e2e-tests.robot
index 00d4ee948..1369f460d 100644
--- a/ods_ci/tests/Tests/0600__distributed_workloads/test-run-kueue-e2e-tests.robot
+++ b/ods_ci/tests/Tests/0600__distributed_workloads/test-run-kueue-e2e-tests.robot
@@ -21,6 +21,7 @@ Run Kueue E2E test
     [Tags]  Tier1
     ...     Kueue
     ...     DistributedWorkloads
+    ...     ExcludeOnDisconnected
     Run Kueue E2E Test    e2e_test.go
 
 Run Sanity test