diff --git a/README.md b/README.md
index 7b42cb9..e21d269 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # dependency-track
 
-![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![AppVersion: 4.12.2](https://img.shields.io/badge/AppVersion-4.12.2-informational?style=flat-square)
+![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![AppVersion: 4.12.2](https://img.shields.io/badge/AppVersion-4.12.2-informational?style=flat-square)
 
 Dependency-Track is an intelligent Software Supply Chain Component Analysis platform that allows organizations to identify and reduce risk from the use of third-party and open source components. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill-of-Materials (SBOM). This approach provides capabilities that traditional Software Composition Analysis (SCA) solutions cannot achieve.
 
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index fdef374..de10f8b 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -4,7 +4,7 @@ description: |
   Dependency-Track is an intelligent Software Supply Chain Component Analysis platform that allows organizations to identify and reduce risk from the use of third-party and open source components. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill-of-Materials (SBOM). This approach provides capabilities that traditional Software Composition Analysis (SCA) solutions cannot achieve.
 name: dependency-track
 home: https://dependencytrack.org/
-version: 1.8.4
+version: 1.8.5
 icon: https://raw.githubusercontent.com/DependencyTrack/branding/master/dt-logo-black-text.svg
 keywords:
  - security
diff --git a/chart/README.md b/chart/README.md
index 1d61c88..b7b05bb 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -1,6 +1,6 @@
 # dependency-track
 
-![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![AppVersion: 4.12.2](https://img.shields.io/badge/AppVersion-4.12.2-informational?style=flat-square)
+![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![AppVersion: 4.12.2](https://img.shields.io/badge/AppVersion-4.12.2-informational?style=flat-square)
 
 Dependency-Track is an intelligent Software Supply Chain Component Analysis platform that allows organizations to identify and reduce risk from the use of third-party and open source components. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill-of-Materials (SBOM). This approach provides capabilities that traditional Software Composition Analysis (SCA) solutions cannot achieve.
 
diff --git a/chart/templates/backend/service.yaml b/chart/templates/backend/service.yaml
index ce59bb8..a8a3088 100644
--- a/chart/templates/backend/service.yaml
+++ b/chart/templates/backend/service.yaml
@@ -11,8 +11,4 @@ spec:
   ports:
   - port: {{ .Values.apiserver.service.port }}
     targetPort: api
-  {{- if ((.Values.apiserver).serviceMonitor).create }}
-  - port: 8080
-    targetPort: metrics
-  {{- end }}
   selector: {{- include "backend.labels.matchLabels" . | nindent 4 }}
diff --git a/chart/templates/backend/servicemonitor.yaml b/chart/templates/backend/servicemonitor.yaml
index 7c84584..0c5574f 100644
--- a/chart/templates/backend/servicemonitor.yaml
+++ b/chart/templates/backend/servicemonitor.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   endpoints:
     - interval: 30s
-      port: metrics
+      port: api
       scheme: http
       path: /metrics
   namespaceSelector: