diff --git a/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java b/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java
index ac48ad0..c9e8561 100644
--- a/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java
+++ b/core/src/main/java/com/kumuluz/ee/metrics/MetricsExtension.java
@@ -293,7 +293,7 @@ public long getCount() {
                     }
                 };
             } else {
-                return (Gauge<Object>) ((com.codahale.metrics.Gauge) metric)::getValue;
+                return (Gauge<Number>) ((com.codahale.metrics.Gauge<Number>) metric)::getValue;
             }
         } else {
             return null;
diff --git a/core/src/main/java/com/kumuluz/ee/metrics/api/ForwardingGauge.java b/core/src/main/java/com/kumuluz/ee/metrics/api/ForwardingGauge.java
index 336a6fe..834c07c 100644
--- a/core/src/main/java/com/kumuluz/ee/metrics/api/ForwardingGauge.java
+++ b/core/src/main/java/com/kumuluz/ee/metrics/api/ForwardingGauge.java
@@ -32,7 +32,7 @@
  * @author Aljaž Blažej
  * @since 1.0.0
  */
-public class ForwardingGauge implements Gauge {
+public class ForwardingGauge implements Gauge<Number> {
 
     private final Method method;
 
@@ -45,8 +45,8 @@ public ForwardingGauge(Method method, Object object) {
     }
 
     @Override
-    public Object getValue() {
-        return invokeMethod(method, object);
+    public Number getValue() {
+        return (Number) invokeMethod(method, object);
     }
 
     private static Object invokeMethod(Method method, Object object) {
diff --git a/core/src/main/java/com/kumuluz/ee/metrics/producers/MetricProducer.java b/core/src/main/java/com/kumuluz/ee/metrics/producers/MetricProducer.java
index 13ef69a..0829903 100644
--- a/core/src/main/java/com/kumuluz/ee/metrics/producers/MetricProducer.java
+++ b/core/src/main/java/com/kumuluz/ee/metrics/producers/MetricProducer.java
@@ -79,7 +79,7 @@ public Histogram produceHistogram(InjectionPoint injectionPoint) {
 
     @SuppressWarnings("unchecked")
     @Produces
-    public <T> Gauge<T> produceGauge(InjectionPoint injectionPoint) {
+    public <T extends Number> Gauge<T> produceGauge(InjectionPoint injectionPoint) {
         MetadataWithTags metadataWithTags = AnnotationMetadata.buildProducerMetadata(injectionPoint, MetricType.GAUGE);
 
         return () -> (T) applicationRegistry.getGauges().get(metadataWithTags.getMetricID()).getValue();
diff --git a/pom.xml b/pom.xml
index 88e623d..245e1bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         <kumuluzee.version>3.6.0</kumuluzee.version>
         <kumuluzee-config-mp.version>1.3.0</kumuluzee-config-mp.version>
 
-        <microprofile-metrics.version>2.2.1</microprofile-metrics.version>
+        <microprofile-metrics.version>2.1.0</microprofile-metrics.version>
         <dropwizard-metrics.version>4.1.0</dropwizard-metrics.version>
         <jackson.version>2.9.9</jackson.version>