diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
index d2ee9312c4..6e7fafc5bf 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
@@ -235,7 +235,7 @@
             "attributes": {
                 "AdditionalMigrationAttempts":  [ {"version": "[10,)",     "wlst_mode": "both",    "wlst_name": "AdditionalMigrationAttempts",  "wlst_path": "WP001", "default_value": 2,        "wlst_type": "integer"  } ],
                 "AllCandidateServers":          [ {"version": "[10,)",     "wlst_mode": "online",  "wlst_name": "AllCandidateServers",          "wlst_path": "WP001", "default_value": null,     "wlst_type": "jarray",           "access": "IGNORED", "preferred_model_type": "list", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean"} ],
-                "Cluster":                      [ {"version": "[10,)",     "wlst_mode": "both",    "wlst_name": "Cluster",                      "wlst_path": "WP001", "default_value": null,     "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "MBEAN.set_cluster_mbean", "set_mbean_type": "weblogic.management.configuration.ClusterMBean"} ],
+                "Cluster":                      [ {"version": "[10,)",     "wlst_mode": "both",    "wlst_name": "Cluster",                      "wlst_path": "WP001", "default_value": null,     "wlst_type": "string",           "get_method": "${LSA:GET}", "set_method": "${MBEAN.set_server_cluster_mbean:MBEAN.set_cluster_mbean}", "set_mbean_type": "weblogic.management.configuration.ClusterMBean"} ],
                 "ConstrainedCandidateServer":   [ {"version": "[10,)",     "wlst_mode": "offline", "wlst_name": "ConstrainedCandidateServer",   "wlst_path": "WP001", "default_value": null,     "wlst_type": "delimited_string", "preferred_model_type": "delimited_string", "get_method": "LSA" } ,
                                                   {"version": "[10,)",     "wlst_mode": "online",  "wlst_name": "ConstrainedCandidateServers",  "wlst_path": "WP001", "default_value": null,     "wlst_type": "jarray",           "preferred_model_type": "list", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean"} ],
                 "Critical":                     [ {"version": "[12.2.1,)", "wlst_mode": "both",    "wlst_name": "Critical",                     "wlst_path": "WP001", "default_value": "false",  "wlst_type": "boolean" } ],
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
index 85fef95ed1..782fb4a88b 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
@@ -1533,7 +1533,7 @@
         ],
         "CleanupOrphanedSessionsEnabled":               [ {"version": "[12.2.1.4,)",     "wlst_mode": "both",    "wlst_name": "CleanupOrphanedSessionsEnabled",               "wlst_path": "WP001", "default_value": "false",               "wlst_type": "boolean"          } ],
         "ClientCertProxyEnabled":                       [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "ClientCertProxyEnabled",                       "wlst_path": "WP001", "default_value": "false",               "wlst_type": "boolean"          } ],
-        "Cluster":                                      [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "Cluster",                                      "wlst_path": "WP001", "default_value": null,                  "wlst_type": "string",          "get_method": "LSA", "set_method": "${:MBEAN.set_server_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.ClusterMBean}" } ],
+        "Cluster":                                      [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "Cluster",                                      "wlst_path": "WP001", "default_value": null,                  "wlst_type": "string",          "get_method": "LSA", "set_method": "${MBEAN.set_server_cluster_mbean:MBEAN.set_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.ClusterMBean}" } ],
         "ClusterWeight":                                [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "ClusterWeight",                                "wlst_path": "WP001", "default_value": 100,                   "wlst_type": "integer"          } ],
         "CoherenceClusterSystemResource":               [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "CoherenceClusterSystemResource",               "wlst_path": "WP001", "default_value": null,                  "wlst_type": "string",          "get_method": "LSA", "set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}" } ],
         "CompleteCOMMessageTimeout":                    [ {"version": "[12.1.2,)",       "wlst_mode": "both",    "wlst_name": "CompleteCOMMessageTimeout",                    "wlst_path": "WP001", "default_value": -1,                    "wlst_type": "integer"          } ],