diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 45e3cdd..b21b124 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -125,9 +125,32 @@
 
 
 @pytest.fixture
+def wa_for_import_ceph_classes_after_infra_prod36461(reclass_actions,
+                                                     salt_actions):
+    if salt_actions.cmd_run("rgw*", "test.ping")[0].keys():
+        # ####### WA for Ceph RGW* classes PROD-36461 ###
+        LOG.info("Changing class sequence for RGW PROD-36461")
+        reclass_actions.delete_class(
+            "cluster.${_param:cluster_name}.ceph",
+            "cluster/*/ceph/rgw.yml")
+        reclass_actions.delete_class(
+            "cluster.${_param:cluster_name}.ceph.common",
+            "cluster/*/ceph/rgw.yml")
+        reclass_actions.add_class(
+            "cluster.${_param:cluster_name}.ceph",
+            "cluster/*/ceph/rgw.yml")
+        reclass_actions.add_class(
+            "cluster.${_param:cluster_name}.ceph.common",
+            "cluster/*/ceph/rgw.yml")
+        reclass_actions.commit(
+            "[from TCP-QA] Changing class sequence for RGW")
+    else:
+        LOG.info("Skip WA for RGW PROD-36461")
+
+
+@pytest.fixture
 def wa_for_alerta_password_prod35958(reclass_actions,
                                      salt_actions):
-
     if not salt_actions.get_pillar("I@prometheus:alerta",
                                    "_param:alerta_admin_api_key_generated")[0]:
         reclass_actions.add_key(
@@ -169,7 +192,8 @@
 
 @pytest.mark.usefixtures("switch_to_proposed_pipelines",
                          "wa_for_galera_clustercheck_password_prod35705",
-                         "wa_for_alerta_password_prod35958")
+                         "wa_for_alerta_password_prod35958",
+                         "wa_for_import_ceph_classes_after_infra_prod36461")
 class TestUpdateMcpCluster(object):
     """
     Following the steps in