diff --git a/Dockerfile b/Dockerfile
index bc4d6d1f..434256e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server 
-FROM docker.io/amvanbaren/openvsx-server:1c54327
+FROM docker.io/amvanbaren/openvsx-server:7dc8233
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
 COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/
diff --git a/configuration/application.yml b/configuration/application.yml
index 6bd08749..52ed5758 100644
--- a/configuration/application.yml
+++ b/configuration/application.yml
@@ -62,11 +62,6 @@ management:
   health:
     probes:
       enabled: true
-  metrics:
-    tags:
-      application: ${spring.application.name}
-      environment: ${ENVNAME}
-      instance: ${HOSTNAME}
   endpoints:
     web:
       exposure:
@@ -167,3 +162,6 @@ ovsx:
       seconds: 300
   integrity:
     key-pair: create
+  metrics:
+    environment: ${ENVNAME}
+    instance: ${HOSTNAME}