diff --git a/ods_ci/build/Dockerfile_interop b/ods_ci/build/Dockerfile_interop
index 773c584b8..04757a971 100644
--- a/ods_ci/build/Dockerfile_interop
+++ b/ods_ci/build/Dockerfile_interop
@@ -25,7 +25,7 @@ COPY ods_ci/test-variables.yml.example ${ODS_VENV}/ods_ci/test-variables.yml
 
 RUN dnf install epel-release -y &&\
     dnf -y update &&\
-    dnf install -y jq git unzip chromium chromedriver httpd-tools gcc \
+    dnf install -y jq git unzip chromium chromedriver httpd-tools gcc wget \
                    python3 python3-devel python3-distro python-pip python${PYTHON_VERSION} python${PYTHON_VERSION}-devel &&\
     dnf clean all && rm -rf /var/cache/yum &&\
     curl --proto "=https" -L https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64 -o /usr/bin/yq &&\
@@ -34,7 +34,12 @@ RUN dnf install epel-release -y &&\
     tar xvf ${HOME}/oc_client.tar.gz -C /usr/local/bin/ && \
     rm -rf ${HOME}/oc_client.tar.gz && rm /usr/local/bin/README.md && chmod 755 /usr/local/bin/oc && oc version --client && \
     curl --proto "=https" -L https://github.com/openshift-online/ocm-cli/releases/download/v0.1.62/ocm-linux-amd64 -o ${HOME}/ocm && \
-    mv ${HOME}/ocm /usr/local/bin/ && chmod 755 /usr/local/bin/ocm && ocm version
+    mv ${HOME}/ocm /usr/local/bin/ && chmod 755 /usr/local/bin/ocm && ocm version && \
+    wget https://github.com/fullstorydev/grpcurl/releases/download/v1.8.7/grpcurl_1.8.7_linux_x86_64.tar.gz -q && \
+    tar xzf grpcurl_1.8.7_linux_x86_64.tar.gz && \
+    rm -rf grpcurl_1.8.7_linux_x86_64.tar.gz && \
+    mv grpcurl /usr/bin/grpcurl && \
+    chmod +x /usr/bin/grpcurl
 
 RUN alternatives --install /usr/local/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1
 RUN python3 --version
diff --git a/ods_ci/run_interop.sh b/ods_ci/run_interop.sh
index 70fcb06d1..c7efe96e6 100755
--- a/ods_ci/run_interop.sh
+++ b/ods_ci/run_interop.sh
@@ -24,6 +24,21 @@ yq -i '.ODH_DASHBOARD_URL=env(RHODS_DASHBOARD)' "${TEST_VARIABLES_FILE}"
 yq -i '.BROWSER.NAME="firefox"' "${TEST_VARIABLES_FILE}"
 yq -i '.S3.AWS_ACCESS_KEY_ID=env(AWS_ACCESS_KEY_ID)' "${TEST_VARIABLES_FILE}"
 yq -i '.S3.AWS_SECRET_ACCESS_KEY=env(AWS_SECRET_ACCESS_KEY)' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_1.NAME="ods-ci-s3"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_1.REGION="us-east-1"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_1.ENDPOINT="https://s3.amazonaws.com/"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_2.NAME="ods-ci-ds-pipelines"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_2.REGION="us-east-1"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_2.ENDPOINT="https://s3.amazonaws.com/"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_3.NAME="ods-ci-wisdom"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_3.REGION="us-east-1"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_3.ENDPOINT="https://s3.amazonaws.com/"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_4.NAME="ods-ci-pachyderm"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_4.REGION="us-east-1"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_4.ENDPOINT="https://s3.amazonaws.com/"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_5.NAME="rhoai-dw"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_5.REGION="us-east-1"' "${TEST_VARIABLES_FILE}"
+yq -i '.S3.BUCKET_5.ENDPOINT="https://s3.amazonaws.com/"' "${TEST_VARIABLES_FILE}"
 
 echo "Performing oc login with cluster admin"
 username=$(yq eval '.OCP_ADMIN_USER.USERNAME' "${TEST_VARIABLES_FILE}")
@@ -46,4 +61,4 @@ if [[ -z "${ARTIFACT_DIR}" ]]; then
   ARTIFACT_DIR="/tmp"
 fi
 
-poetry run robot --include ${TEST_SUITE} --exclude "AutomationBug" --exclude "ProductBug" --exclude "ExcludeOnRHOAI" -d ${ARTIFACT_DIR} -x xunit_test_result.xml -r test_report.html --variablefile ${TEST_VARIABLES_FILE} ${TEST_CASE_FILE}
+poetry run robot --include ${TEST_SUITE} --exclude "Resources-*" --exclude "AutomationBug" --exclude "ProductBug" --exclude "ExcludeOnRHOAI" -d ${ARTIFACT_DIR} -x xunit_test_result.xml -r test_report.html --variablefile ${TEST_VARIABLES_FILE} ${TEST_CASE_FILE}