diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
index b8d0b24847..521408b701 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/HddsConfServlet.java
@@ -154,7 +154,7 @@ private void processConfigTagRequest(HttpServletRequest request,
 
     switch (cmd) {
     case "getOzoneTags":
-      out.write(gson.toJson(config.get("ozone.system.tags").split(",")));
+      out.write(gson.toJson(config.get("ozone.tags.system").split(",")));
       break;
     case "getPropertyByTag":
       String tags = request.getParameter("tags");
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 648ba05fb8..e0aca67605 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1006,12 +1006,12 @@
   </property>
 
   <property>
-    <name>hadoop.custom.tags</name>
+    <name>hadoop.tags.custom</name>
     <value>OZONE,MANAGEMENT,SECURITY,PERFORMANCE,DEBUG,CLIENT,SERVER,KSM,SCM,CRITICAL,RATIS,CONTAINER,REQUIRED,REST,STORAGE,PIPELINE,STANDALONE</value>
   </property>
 
   <property>
-    <name>ozone.system.tags</name>
+    <name>ozone.tags.system</name>
     <value>OZONE,MANAGEMENT,SECURITY,PERFORMANCE,DEBUG,CLIENT,SERVER,KSM,SCM,CRITICAL,RATIS,CONTAINER,REQUIRED,REST,STORAGE,PIPELINE,STANDALONE</value>
   </property>