diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76515de..6197ec1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
     TEST_MARKER:
     - "tcp"
     - "serial"
-    - "generic"
+#    - "generic"  // Disabling during the CI refactor on tests
 #    - "tcp_p4"
 #    - "serial_p4"
 
diff --git a/test_apps/.build-test-rules.yml b/test_apps/.build-test-rules.yml
index bf2f008..6bf3527 100644
--- a/test_apps/.build-test-rules.yml
+++ b/test_apps/.build-test-rules.yml
@@ -3,7 +3,8 @@ physical_tests:
     - if: IDF_TARGET != "esp32"
       reason: only manual test is performed for other targets
   disable:
-    - if: CONFIG_NAME == "wifi" and SOC_WIFI_SUPPORTED != 1 and IDF_TARGET != "esp32"
+      - if: CONFIG_NAME != "serial"
+    # - if: CONFIG_NAME == "wifi" and SOC_WIFI_SUPPORTED != 1 and IDF_TARGET != "esp32"
 
 tcp_instances_tests/mb_tcp_master_instances:
   disable_test:
@@ -21,10 +22,16 @@ tcp_instances_tests/mb_tcp_slave_instances:
 
 unit_tests:
   disable_test:
-    - if: IDF_TARGET != "esp32"
-      reason: only manual test is performed for other targets
+    - if: "1 == 1" # Disabling for the Ci build and test Refactor
+    # - if: IDF_TARGET != "esp32"
+    #   reason: only manual test is performed for other targets
+  disable:
+    - if: "1 == 1" # Disabling for the Ci test Refactor
 
 adapter_tests:
   disable_test:
-    - if: IDF_TARGET != "esp32"
-      reason: only manual test is performed for other targets
+      - if: "1 == 1" # Disabling for the Ci build and test Refactor
+    # - if: IDF_TARGET != "esp32"
+    #   reason: only manual test is performed for other targets
+  disable:
+    - if: "1 == 1" # Disabling for the Ci build and test Refactor
diff --git a/test_apps/physical_tests/pytest_mb_comm_multi_dev.py b/test_apps/physical_tests/pytest_mb_comm_multi_dev.py
index f43254a..c4d6f54 100644
--- a/test_apps/physical_tests/pytest_mb_comm_multi_dev.py
+++ b/test_apps/physical_tests/pytest_mb_comm_multi_dev.py
@@ -16,15 +16,16 @@ def test_modbus_comm_multi_dev_serial(case_tester) -> None:  # type: ignore
             print(f"Test case: {case.name}")
             case_tester.run_multi_dev_case(case=case, reset=True)
 
+## Disabling for the Ci build and test Refactor
 
-@pytest.mark.parametrize("count, config", [(2, "ethernet")], indirect=True)
-@pytest.mark.parametrize("target", ["esp32"], indirect=True)
-@pytest.mark.multi_dut_modbus_tcp
-def test_modbus_comm_multi_dev_tcp(case_tester) -> None:  # type: ignore
-    for case in case_tester.test_menu:
-        if (
-            case.attributes.get("test_env", "multi_dut_modbus_tcp")
-            == "multi_dut_modbus_tcp"
-        ):
-            print(f"Test case: {case.name}")
-            case_tester.run_multi_dev_case(case=case, reset=True)
+# @pytest.mark.parametrize("count, config", [(2, "ethernet")], indirect=True)
+# @pytest.mark.parametrize("target", ["esp32"], indirect=True)
+# @pytest.mark.multi_dut_modbus_tcp
+# def test_modbus_comm_multi_dev_tcp(case_tester) -> None:  # type: ignore
+#     for case in case_tester.test_menu:
+#         if (
+#             case.attributes.get("test_env", "multi_dut_modbus_tcp")
+#             == "multi_dut_modbus_tcp"
+#         ):
+#             print(f"Test case: {case.name}")
+#             case_tester.run_multi_dev_case(case=case, reset=True)