diff --git a/inc/saiswitch.h b/inc/saiswitch.h
index 843d61028a..8dc0c7e230 100644
--- a/inc/saiswitch.h
+++ b/inc/saiswitch.h
@@ -331,6 +331,8 @@ typedef enum _sai_switch_failover_config_mode_t
  * per tunnel type global configuration.
  * SAI_OBJECT_TYPE_TUNNEL object configuration
  * overrides the switch scoped global configuration.
+ *
+ * @flags Contains flags
  */
 typedef enum _sai_switch_tunnel_attr_t
 {
@@ -355,7 +357,7 @@ typedef enum _sai_switch_tunnel_attr_t
      * @flags CREATE_AND_SET
      * @default SAI_PACKET_ACTION_FORWARD
      */
-    SAI_SWITCH_TUNNEL_ATTR_LOOPBACK_PACKET_ACTION,
+    SAI_SWITCH_TUNNEL_ATTR_LOOPBACK_PACKET_ACTION = 1,
 
     /**
      * @brief Enable TC AND COLOR -> DSCP MAP on tunnel at encapsulation (access-to-network) node to remark the DSCP in tunnel header
@@ -366,7 +368,7 @@ typedef enum _sai_switch_tunnel_attr_t
      * @allownull true
      * @default SAI_NULL_OBJECT_ID
      */
-    SAI_SWITCH_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP,
+    SAI_SWITCH_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP = 9,
 
     /**
      * @brief Enable TC -> Queue MAP on tunnel encap
@@ -423,6 +425,8 @@ typedef enum _sai_switch_tunnel_attr_t
 /**
  * @brief Attribute Id in sai_set_switch_attribute() and
  * sai_get_switch_attribute() calls
+ *
+ * @flags Contains flags
  */
 typedef enum _sai_switch_attr_t
 {
@@ -2352,23 +2356,23 @@ typedef enum _sai_switch_attr_t
     SAI_SWITCH_ATTR_SUPPORTED_FAILOVER_MODE,
 
     /**
-     * @brief Switch scoped Tunnel objects
+     * @brief Packet action when a packet ingress and gets routed back to same tunnel
      *
-     * @type sai_object_list_t
+     * @type sai_packet_action_t
      * @flags CREATE_AND_SET
-     * @objects SAI_OBJECT_TYPE_SWITCH_TUNNEL
-     * @default empty
+     * @default SAI_PACKET_ACTION_FORWARD
      */
-    SAI_SWITCH_ATTR_TUNNEL_OBJECTS_LIST,
+    SAI_SWITCH_ATTR_TUNNEL_LOOPBACK_PACKET_ACTION = 186,
 
     /**
-     * @brief Packet action when a packet ingress and gets routed back to same tunnel
+     * @brief Switch scoped Tunnel objects
      *
-     * @type sai_packet_action_t
+     * @type sai_object_list_t
      * @flags CREATE_AND_SET
-     * @default SAI_PACKET_ACTION_FORWARD
+     * @objects SAI_OBJECT_TYPE_SWITCH_TUNNEL
+     * @default empty
      */
-    SAI_SWITCH_ATTR_TUNNEL_LOOPBACK_PACKET_ACTION,
+    SAI_SWITCH_ATTR_TUNNEL_OBJECTS_LIST = 190,
 
     /**
      * @brief End of attributes
diff --git a/inc/saitunnel.h b/inc/saitunnel.h
index 37071bb904..854b1717a0 100644
--- a/inc/saitunnel.h
+++ b/inc/saitunnel.h
@@ -448,6 +448,8 @@ typedef enum _sai_tunnel_peer_mode_t
 
 /**
  * @brief Defines tunnel attributes
+ *
+ * @flags Contains flags
  */
 typedef enum _sai_tunnel_attr_t
 {
@@ -661,7 +663,7 @@ typedef enum _sai_tunnel_attr_t
      * @allownull true
      * @default SAI_NULL_OBJECT_ID
      */
-    SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP,
+    SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP = 25,
 
     /**
      * @brief Enable TC -> Queue MAP on tunnel encap