diff --git a/managed/src/main/java/com/yugabyte/yw/common/config/ConfDataType.java b/managed/src/main/java/com/yugabyte/yw/common/config/ConfDataType.java
index 2542557af1ea..05c736752a7f 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/config/ConfDataType.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/config/ConfDataType.java
@@ -271,9 +271,7 @@ public static List<ConfKeyTags> parseTagsList(String s) {
     } catch (Exception e) {
       throw new PlatformServiceException(
           BAD_REQUEST,
-          "Not a valid list of tags."
-              + "All possible tags are "
-              + "PUBLIC, UIDriven, BETA, INTERNAL, YBM");
+          "Not a valid list of tags." + "All possible tags are " + "PUBLIC, BETA, INTERNAL");
     }
   }
 
diff --git a/managed/src/main/java/com/yugabyte/yw/common/config/ConfKeyInfo.java b/managed/src/main/java/com/yugabyte/yw/common/config/ConfKeyInfo.java
index d40c39c59677..8711f03d6c09 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/config/ConfKeyInfo.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/config/ConfKeyInfo.java
@@ -34,12 +34,8 @@ public enum ConfKeyTags {
     PUBLIC,
     // Keys hidden from the UI
     INTERNAL,
-    // YBM Keys
-    YBM,
     // Keys for which we do not have metadata yet
     BETA,
-    // Keys with dedicated UI
-    UIDriven,
     // Feature flag keys. Only allowed data type: boolean.
     // These can be viewed without authorising. Should only be set at global scope.
     FEATURE_FLAG
diff --git a/managed/src/main/java/com/yugabyte/yw/common/config/GlobalConfKeys.java b/managed/src/main/java/com/yugabyte/yw/common/config/GlobalConfKeys.java
index 3acebce99e15..4848747dbe17 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/config/GlobalConfKeys.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/config/GlobalConfKeys.java
@@ -80,7 +80,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Use OAUTH",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> ybSecurityType =
       new ConfKeyInfo<>(
           "yb.security.type",
@@ -88,7 +88,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "YB Security Type",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Boolean> displayJWTToken =
       new ConfKeyInfo<>(
           "yb.security.showJWTInfoOnLogin",
@@ -96,7 +96,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Display JWT Token on Login Screen",
           "Display JWT Token on Login Screen",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> ybClientID =
       new ConfKeyInfo<>(
           "yb.security.clientID",
@@ -104,7 +104,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "YB Client ID",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> ybSecuritySecret =
       new ConfKeyInfo<>(
           "yb.security.secret",
@@ -112,7 +112,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "YB Security Secret",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> discoveryURI =
       new ConfKeyInfo<>(
           "yb.security.discoveryURI",
@@ -120,7 +120,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Discovery URI",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> oidcProviderMetadata =
       new ConfKeyInfo<>(
           "yb.security.oidcProviderMetadata",
@@ -128,7 +128,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Provider Metadata from discoveryURI",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> oidcScope =
       new ConfKeyInfo<>(
           "yb.security.oidcScope",
@@ -136,7 +136,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "OIDC Scope",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> oidcEmailAttribute =
       new ConfKeyInfo<>(
           "yb.security.oidcEmailAttribute",
@@ -144,7 +144,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "OIDC Email Attribute",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Boolean> ssh2Enabled =
       new ConfKeyInfo<>(
           "yb.security.ssh2_enabled",
@@ -485,7 +485,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Use LDAP",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapUrl =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_url",
@@ -493,7 +493,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP URL",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapPort =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_port",
@@ -501,7 +501,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Port",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapBaseDn =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_basedn",
@@ -509,7 +509,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Base DN",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapDnPrefix =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_dn_prefix",
@@ -517,7 +517,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP DN Prefix",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapCustomerUUID =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_customeruuid",
@@ -525,7 +525,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Customer UUID",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapServiceAccountDistinguishedName =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_service_account_distinguished_name",
@@ -533,7 +533,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Service Account Username",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapServiceAccountPassword =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_service_account_password",
@@ -541,7 +541,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Service Account Password",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> enableLdap =
       new ConfKeyInfo<>(
           "yb.security.ldap.enable_ldaps",
@@ -549,7 +549,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Enable LDAPS",
           "TODO - Leave this for feature owners to fill in",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> enableLdapStartTls =
       new ConfKeyInfo<>(
           "yb.security.ldap.enable_ldap_start_tls",
@@ -557,7 +557,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Enable LDAPS start TLS",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> ldapUseSearchAndBind =
       new ConfKeyInfo<>(
           "yb.security.ldap.use_search_and_bind",
@@ -565,7 +565,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Use Search and Bind",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapSearchAttribute =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_search_attribute",
@@ -573,7 +573,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Search Attribute",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapGroupSearchFilter =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_search_filter",
@@ -581,7 +581,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Group Search Filter Query",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<SearchScope> ldapGroupSearchScope =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_search_scope",
@@ -589,7 +589,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP group search scope in case of filter query",
           "Hidden because this key has dedicated UI",
           ConfDataType.LdapSearchScopeEnum,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapGroupSearchBaseDn =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_search_base_dn",
@@ -597,7 +597,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP group search base DN in case of filter query",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<String> ldapGroupMemberOfAttribute =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_member_of_attribute",
@@ -605,7 +605,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "memberOf attribute in user LDAP entry to be used for group memberships",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> ldapGroupUseQuery =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_use_query",
@@ -614,7 +614,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
               + "for establishing LDAP group membership",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> ldapGroupUseRoleMapping =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_group_use_role_mapping",
@@ -622,7 +622,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Whether to use ldap group to role mapping",
           "Hidden because this key has dedicated UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Role> ldapDefaultRole =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_default_role",
@@ -630,7 +630,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Default Role",
           "Which role to use in case role cannot be discerned via LDAP",
           ConfDataType.UserRoleEnum,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<TlsProtocol> ldapTlsProtocol =
       new ConfKeyInfo<>(
           "yb.security.ldap.ldap_tls_protocol",
@@ -638,7 +638,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Which TLS protocol to use for StartTLS or LDAPS",
           "Hidden because this key has dedicated UI",
           ConfDataType.LdapTlsProtocol,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static ConfKeyInfo<Boolean> ldapsEnforceCertVerification =
       new ConfKeyInfo<>(
           "yb.security.ldap.enforce_server_cert_verification",
@@ -1271,7 +1271,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "OIDC default role",
           "Which role to use incase group memberships are not found",
           ConfDataType.UserRoleEnum,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Boolean> enableReleasesRedesign =
       new ConfKeyInfo<>(
           "yb.releases.use_redesign",
@@ -1311,7 +1311,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "LDAP Search Filter",
           "Hidden because this key has dedicated UI",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<String> oidcRefreshTokenEndpoint =
       new ConfKeyInfo<>(
           "yb.security.oidcRefreshTokenEndpoint",
@@ -1319,7 +1319,7 @@ public class GlobalConfKeys extends RuntimeConfigKeysModule {
           "Endpoint for fetching the access token",
           "YBA will fetch the access token using the refresh token if specified from the endpoint",
           ConfDataType.StringType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Duration> oidcRefreshTokenInterval =
       new ConfKeyInfo<>(
           "yb.security.oidcRefreshTokenInterval",
diff --git a/managed/src/main/java/com/yugabyte/yw/common/config/UniverseConfKeys.java b/managed/src/main/java/com/yugabyte/yw/common/config/UniverseConfKeys.java
index 59c802a9a2f7..9fe77ecd6e72 100644
--- a/managed/src/main/java/com/yugabyte/yw/common/config/UniverseConfKeys.java
+++ b/managed/src/main/java/com/yugabyte/yw/common/config/UniverseConfKeys.java
@@ -878,7 +878,7 @@ public class UniverseConfKeys extends RuntimeConfigKeysModule {
           "Enable Rollback Support",
           "Enable Yugabyte DB Rollback support",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Boolean> allowGFlagsOverrideDuringPreFinalize =
       new ConfKeyInfo<>(
           "yb.gflags.allow_during_prefinalize",
@@ -940,7 +940,7 @@ public class UniverseConfKeys extends RuntimeConfigKeysModule {
           "Configure YSQL DB API",
           "Allow users to configure YSQL DB API from UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Boolean> allowConfigureYCQL =
       new ConfKeyInfo<>(
           "yb.configure_db_api.ycql",
@@ -948,7 +948,7 @@ public class UniverseConfKeys extends RuntimeConfigKeysModule {
           "Configure YCQL DB API",
           "Allow users to configure YCQL DB API from UI",
           ConfDataType.BooleanType,
-          ImmutableList.of(ConfKeyTags.UIDriven));
+          ImmutableList.of(ConfKeyTags.INTERNAL));
   public static final ConfKeyInfo<Duration> waitForReplicationDrainTimeout =
       new ConfKeyInfo<>(
           "yb.xcluster.transactional.wait_for_replication_drain_timeout",
diff --git a/managed/src/main/resources/application.conf b/managed/src/main/resources/application.conf
index 00748c9153a9..7185c559a572 100644
--- a/managed/src/main/resources/application.conf
+++ b/managed/src/main/resources/application.conf
@@ -63,7 +63,7 @@ yb {
   gcp.default_volume_size_gb = 100
   azure.default_volume_size_gb = 100
 
-  runtime_conf_ui.tag_filter = ["PUBLIC","BETA","INTERNAL","UIDriven","YBM"]
+  runtime_conf_ui.tag_filter = ["PUBLIC","BETA","INTERNAL"]
 }
 
 ybc {
diff --git a/managed/src/main/resources/swagger-strict.json b/managed/src/main/resources/swagger-strict.json
index 7fb1f51d8f5d..08c3515b7b87 100644
--- a/managed/src/main/resources/swagger-strict.json
+++ b/managed/src/main/resources/swagger-strict.json
@@ -3859,7 +3859,7 @@
         },
         "tags" : {
           "items" : {
-            "enum" : [ "PUBLIC", "INTERNAL", "YBM", "BETA", "UIDriven", "FEATURE_FLAG" ],
+            "enum" : [ "PUBLIC", "INTERNAL", "BETA", "FEATURE_FLAG" ],
             "type" : "string"
           },
           "type" : "array"
diff --git a/managed/src/main/resources/swagger.json b/managed/src/main/resources/swagger.json
index 564a3235c85e..99bde8cb3a66 100644
--- a/managed/src/main/resources/swagger.json
+++ b/managed/src/main/resources/swagger.json
@@ -3894,7 +3894,7 @@
         },
         "tags" : {
           "items" : {
-            "enum" : [ "PUBLIC", "INTERNAL", "YBM", "BETA", "UIDriven", "FEATURE_FLAG" ],
+            "enum" : [ "PUBLIC", "INTERNAL", "BETA", "FEATURE_FLAG" ],
             "type" : "string"
           },
           "type" : "array"
diff --git a/managed/src/test/java/com/yugabyte/yw/common/config/ConfDataTypeTest.java b/managed/src/test/java/com/yugabyte/yw/common/config/ConfDataTypeTest.java
index 2c6c10f0dc33..9ed77b96d21e 100644
--- a/managed/src/test/java/com/yugabyte/yw/common/config/ConfDataTypeTest.java
+++ b/managed/src/test/java/com/yugabyte/yw/common/config/ConfDataTypeTest.java
@@ -16,9 +16,8 @@ public class ConfDataTypeTest {
 
   @Test
   public void tagListParse() {
-    List<ConfKeyTags> list =
-        new ArrayList<>(Arrays.asList(ConfKeyTags.PUBLIC, ConfKeyTags.BETA, ConfKeyTags.UIDriven));
-    assertTrue(list.equals(parseTagsList("[\"PUBLIC\",\"BETA\",\"UIDriven\"]")));
+    List<ConfKeyTags> list = new ArrayList<>(Arrays.asList(ConfKeyTags.PUBLIC, ConfKeyTags.BETA));
+    assertTrue(list.equals(parseTagsList("[\"PUBLIC\",\"BETA\"]")));
     // Strings should be enclosed within double quotes
     assertPlatformException(() -> parseTagsList("[Three,Sample,String]"));
     assertPlatformException(() -> parseTagsList("[\"Invalid\",\"tags\"]"));
diff --git a/managed/src/test/java/com/yugabyte/yw/controllers/RuntimeConfControllerTest.java b/managed/src/test/java/com/yugabyte/yw/controllers/RuntimeConfControllerTest.java
index b84ffa66cdc4..d9f5ab13057c 100644
--- a/managed/src/test/java/com/yugabyte/yw/controllers/RuntimeConfControllerTest.java
+++ b/managed/src/test/java/com/yugabyte/yw/controllers/RuntimeConfControllerTest.java
@@ -526,9 +526,7 @@ public void dataValidationTest() {
     assertValue(
         rJson,
         "error",
-        "Not a valid list of tags."
-            + "All possible tags are "
-            + "PUBLIC, UIDriven, BETA, INTERNAL, YBM");
+        "Not a valid list of tags." + "All possible tags are " + "PUBLIC, BETA, INTERNAL");
   }
 
   @Test