diff --git a/ods_ci/run_interop.sh b/ods_ci/run_interop.sh
index d7d6749ed..933a03763 100755
--- a/ods_ci/run_interop.sh
+++ b/ods_ci/run_interop.sh
@@ -61,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} -d ${ARTIFACT_DIR} -x xunit_test_result.xml -r test_report.html --variablefile ${TEST_VARIABLES_FILE} ${TEST_CASE_FILE}
diff --git a/ods_ci/tests/Tests/0100__platform/0103__must_gather/test-must-gather-logs.robot b/ods_ci/tests/Tests/0100__platform/0103__must_gather/test-must-gather-logs.robot
index 61712deed..e1ec6ffc4 100644
--- a/ods_ci/tests/Tests/0100__platform/0103__must_gather/test-must-gather-logs.robot
+++ b/ods_ci/tests/Tests/0100__platform/0103__must_gather/test-must-gather-logs.robot
@@ -10,7 +10,7 @@ Resource         ../../../Resources/CLI/MustGather/MustGather.resource
 *** Test Cases ***
 Verify that the must-gather image provides RHODS logs and info
     [Documentation]   Tests the must-gather image for ODH/RHOAI
-    [Tags]   Smoke
+    [Tags]   Smoke   Interop
     ...      ODS-505
     ...      Operator
     ...      MustGather
diff --git a/ods_ci/tests/Tests/0400__ods_dashboard/0401__ods_dashboard.robot b/ods_ci/tests/Tests/0400__ods_dashboard/0401__ods_dashboard.robot
index 320d42cfb..e11cff4c9 100644
--- a/ods_ci/tests/Tests/0400__ods_dashboard/0401__ods_dashboard.robot
+++ b/ods_ci/tests/Tests/0400__ods_dashboard/0401__ods_dashboard.robot
@@ -116,7 +116,7 @@ Verify Documentation Links HTTP Status Code
     [Documentation]    It verifies the documentation links present in question mark and
     ...    also checks the RHODS dcoumentation link present in resource page.
     ...    ProductBug: RHOAIENG-11451 (on ODH only)
-    [Tags]    Smoke
+    [Tags]    Smoke   Interop
     ...       ODS-327    ODS-492
     ${links}=  Get RHODS Documentation Links From Dashboard
     # Compare Doc Links only by number, since ODH and RHOAI have diffrent URLs (but same count)
diff --git a/ods_ci/tests/Tests/0400__ods_dashboard/0407__ods_custom_docs.robot b/ods_ci/tests/Tests/0400__ods_dashboard/0407__ods_custom_docs.robot
index 0c5e94d87..47d298d66 100644
--- a/ods_ci/tests/Tests/0400__ods_dashboard/0407__ods_custom_docs.robot
+++ b/ods_ci/tests/Tests/0400__ods_dashboard/0407__ods_custom_docs.robot
@@ -27,7 +27,7 @@ ${CUSTOM_APP_DICT_PATH}=        tests/Resources/Files/CustomAppInfoDictionary.js
 Verify Custom "QuickStart" Resource Creation
     [Documentation]     Create a Custom Resource "QuickStart" by using Dashboard CRDs: OdhQuickStart,
     ...                 and verify steps execution in Sidebar.
-    [Tags]    Smoke
+    [Tags]    Smoke   Interop
     ...       ODS-697
     ${exp_titles}=      Create List    ${EXPECTED_ITEMS_TITLES["quickstart"]}
     Check Items Have Been Displayed In Resources Page     resource_filter=QuickStart
diff --git a/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot b/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot
index d4b81d47b..3461cc7f9 100644
--- a/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot
+++ b/ods_ci/tests/Tests/0500__ide/0501__ide_jupyterhub/test.robot
@@ -16,14 +16,14 @@ Test Tags        JupyterHub
 
 *** Test Cases ***
 Logged Into OpenShift
-    [Tags]   Smoke
+    [Tags]   Smoke   Interop
     ...      ODS-127
     Open OCP Console
     Login To Openshift  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
     Wait Until OpenShift Console Is Loaded
 
 Can Launch Jupyterhub
-    [Tags]   Smoke
+    [Tags]   Smoke   Interop
     ...      ODS-935
     #This keyword will work with accounts that are not cluster admins.
     Launch RHOAI Via OCP Application Launcher
@@ -32,7 +32,7 @@ Can Launch Jupyterhub
     Launch Jupyter From RHODS Dashboard Link
 
 Can Login To Jupyterhub
-    [Tags]   Smoke
+    [Tags]   Smoke   Interop
     ...      ODS-936
     Login To Jupyterhub  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
     ${authorization_required} =  Is Service Account Authorization Required
diff --git a/ods_ci/tests/Tests/0500__ide/0503__ide_anaconda_professional.robot b/ods_ci/tests/Tests/0500__ide/0503__ide_anaconda_professional.robot
index 67ef1a858..cb7c85ae8 100644
--- a/ods_ci/tests/Tests/0500__ide/0503__ide_anaconda_professional.robot
+++ b/ods_ci/tests/Tests/0500__ide/0503__ide_anaconda_professional.robot
@@ -20,7 +20,7 @@ Verify Anaconda Professional Is Available In RHODS Dashboard Explore/Enabled Pag
   [Documentation]  Tests if ACE and its Activation button are present in Explore page.
   ...              If the button is not there, it checks if ACE is already enabled
   [Tags]  Smoke
-  ...     ODS-262
+  ...     ODS-262   Interop
   Open Browser  ${ODH_DASHBOARD_URL}  browser=${BROWSER.NAME}  options=${BROWSER.OPTIONS}
   Login To RHODS Dashboard  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
   Wait For RHODS Dashboard To Load
diff --git a/ods_ci/tests/Tests/0500__ide/0504__ide_intel_aikit.robot b/ods_ci/tests/Tests/0500__ide/0504__ide_intel_aikit.robot
index d75a7f1a6..4995f8123 100644
--- a/ods_ci/tests/Tests/0500__ide/0504__ide_intel_aikit.robot
+++ b/ods_ci/tests/Tests/0500__ide/0504__ide_intel_aikit.robot
@@ -19,7 +19,7 @@ ${image_path}                   image-registry.openshift-image-registry.svc:5000
 *** Test Cases ***
 Verify Intel AIKIT Is Available In RHODS Dashboard Explore Page
   [Tags]  Smoke
-  ...     ODS-1017
+  ...     ODS-1017   Interop
   Open Browser  ${ODH_DASHBOARD_URL}  browser=${BROWSER.NAME}  options=${BROWSER.OPTIONS}
   Login To RHODS Dashboard  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
   Wait For RHODS Dashboard To Load
diff --git a/ods_ci/tests/Tests/0500__ide/0506__ide_ibm_watson_studio.robot b/ods_ci/tests/Tests/0500__ide/0506__ide_ibm_watson_studio.robot
index 16987f9ce..5dfec2eb3 100644
--- a/ods_ci/tests/Tests/0500__ide/0506__ide_ibm_watson_studio.robot
+++ b/ods_ci/tests/Tests/0500__ide/0506__ide_ibm_watson_studio.robot
@@ -11,8 +11,8 @@ Test Tags       ExcludeOnODH
 Verify IBM Watsonx AI Is Available In RHODS Dashboard Explore Page
   [Documentation]  Very simple test to check that the Watsonx.ai tile/card is present
   ...    in the list of applications on the Applications -> Explore page.
-  [Tags]  Smoke
-  ...     ODS-267
+  [Tags]  Smoke   Interop
+  ...     ODS-267   
   Open Browser  ${ODH_DASHBOARD_URL}  browser=${BROWSER.NAME}  options=${BROWSER.OPTIONS}
   Login To RHODS Dashboard  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}
   Wait For RHODS Dashboard To Load
diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/0601__workloads_orchestration/test-smoke.robot b/ods_ci/tests/Tests/0600__distributed_workloads/0601__workloads_orchestration/test-smoke.robot
index 6695d05ff..c4fdb28e5 100644
--- a/ods_ci/tests/Tests/0600__distributed_workloads/0601__workloads_orchestration/test-smoke.robot
+++ b/ods_ci/tests/Tests/0600__distributed_workloads/0601__workloads_orchestration/test-smoke.robot
@@ -10,7 +10,7 @@ Kueue smoke test
     [Tags]    Smoke
     ...       DistributedWorkloads
     ...       WorkloadsOrchestration
-    ...       ODS-2676
+    ...       ODS-2676   Interop
     Log To Console    Waiting for kueue-controller-manager to be available
     ${result} =    Run Process    oc wait --for\=condition\=Available --timeout\=300s -n ${APPLICATIONS_NAMESPACE} deployment/kueue-controller-manager
     ...    shell=true    stderr=STDOUT
diff --git a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-smoke.robot b/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-smoke.robot
index 5d4f28989..fa46fa963 100644
--- a/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-smoke.robot
+++ b/ods_ci/tests/Tests/0600__distributed_workloads/0602__training/test-smoke.robot
@@ -9,7 +9,7 @@ Suite Teardown    Teardown Codeflare E2E Test Suite
 *** Test Cases ***
 Ray smoke test
     [Documentation]    Check that Kuberay deployment and service are up and running
-    [Tags]    Smoke
+    [Tags]    Smoke   Interop
     ...       DistributedWorkloads
     ...       Training
     ...       ODS-2648
@@ -36,7 +36,7 @@ Ray smoke test
 
 Codeflare smoke test
     [Documentation]    Check that Codeflare deployment and its monitoring service are up and running
-    [Tags]    Smoke
+    [Tags]    Smoke    Interop
     ...       DistributedWorkloads
     ...       Training
     ...       ODS-2675
diff --git a/ods_ci/tests/Tests/2000__other_components/600__ai_apps/640__rhoam/640__rhoam.robot b/ods_ci/tests/Tests/2000__other_components/600__ai_apps/640__rhoam/640__rhoam.robot
index 2ca1d0292..082c7b46d 100644
--- a/ods_ci/tests/Tests/2000__other_components/600__ai_apps/640__rhoam/640__rhoam.robot
+++ b/ods_ci/tests/Tests/2000__other_components/600__ai_apps/640__rhoam/640__rhoam.robot
@@ -11,7 +11,7 @@ Test Tags       ExcludeOnODH
 
 *** Test Cases ***
 Verify RHOAM Is Available In RHODS Dashboard Explore Page
-  [Tags]    Smoke   Tier1
+  [Tags]    Smoke   Tier1   Interop
   ...       ODS-271
   Open Browser  ${ODH_DASHBOARD_URL}  browser=${BROWSER.NAME}  options=${BROWSER.OPTIONS}
   Login To RHODS Dashboard  ${TEST_USER.USERNAME}  ${TEST_USER.PASSWORD}  ${TEST_USER.AUTH_TYPE}