diff --git a/CHANGELOG.md b/CHANGELOG.md
index 336c1406d..600d1f221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 ### Changed
+- add CounterBasedGauge64 and ZeroBasedCounter64 as metrics types
 
 ### Fixes
 - fix problem with service rendering when `traps.service.usemetallb` is set to false
diff --git a/docs/microk8s/configuration/snmp-data-format.md b/docs/microk8s/configuration/snmp-data-format.md
index ceceae45a..c9b185aa6 100644
--- a/docs/microk8s/configuration/snmp-data-format.md
+++ b/docs/microk8s/configuration/snmp-data-format.md
@@ -5,12 +5,13 @@ which change dynamically, while textual fields are helpful context to understand
 
 SC4SNMP classifies the data element as a metric when its type is one of the following:
 
-- `Unsigned`
-- `Counter`
+- `Unsigned32`, `Unsigned64`
+- `Counter32`, `Counter64`
 - `TimeTicks`
-- `Gauge`
-- `Integer`
-
+- `Gauge32`, `Gauge64`
+- `Integer`, `Integer32`
+- `CounterBasedGauge64`
+- `ZeroBasedCounter64`
 Every other type is interpreted as a field value.
 
 Sometimes, the MIB file indicates a field as an `INTEGER`, but there is also some mapping defined. See the following`IF-MIB.ifOperStatus` example:
diff --git a/splunk_connect_for_snmp/snmp/manager.py b/splunk_connect_for_snmp/snmp/manager.py
index bdc05f6bd..60508bf1f 100644
--- a/splunk_connect_for_snmp/snmp/manager.py
+++ b/splunk_connect_for_snmp/snmp/manager.py
@@ -184,7 +184,9 @@ def get_group_key(mib, oid, index) -> str:
     return mib + "::" + ";".join(parts)
 
 
-MTYPES_CC = tuple(["Counter32", "Counter64", "TimeTicks"])
+MTYPES_CC = tuple(
+    ["Counter32", "Counter64", "TimeTicks", "CounterBasedGauge64", "ZeroBasedCounter64"]
+)
 MTYPES_G = tuple(
     ["Gauge32", "Gauge64", "Integer", "Integer32", "Unsigned32", "Unsigned64"]
 )