diff --git a/charts/enterprise/prometheus/Chart.yaml b/charts/enterprise/prometheus/Chart.yaml
index 3258f798c78..34539c9039a 100644
--- a/charts/enterprise/prometheus/Chart.yaml
+++ b/charts/enterprise/prometheus/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: prometheus
-version: 16.1.9
+version: 16.2.0
 appVersion: 2.48.1
 description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator.
 home: https://truecharts.org/charts/enterprise/prometheus
diff --git a/charts/enterprise/prometheus/questions.yaml b/charts/enterprise/prometheus/questions.yaml
index 72689e3ac7e..545d8bec543 100644
--- a/charts/enterprise/prometheus/questions.yaml
+++ b/charts/enterprise/prometheus/questions.yaml
@@ -194,7 +194,7 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 10086
+                              default: 9090
                               required: true
         - variable: alertmanager
           label: "alertmanager Service"
@@ -216,7 +216,7 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 10087
+                              default: 9093
                               required: true
 # Include{serviceExpertRoot}
 # Include{serviceExpert}
diff --git a/charts/enterprise/prometheus/values.yaml b/charts/enterprise/prometheus/values.yaml
index e69d185b554..704cfe9f417 100644
--- a/charts/enterprise/prometheus/values.yaml
+++ b/charts/enterprise/prometheus/values.yaml
@@ -23,6 +23,36 @@ workload:
               enabled: false
             startup:
               enabled: false
+              
+
+configmap:
+  grafana-datasource:
+    enabled: "{{ if .Values.grafana.datasource.enabled }}true{{ else }}false{{ end }}"
+    data:
+      datasource.yaml: |-
+        apiVersion: 1
+        datasources:
+        - name: Prometheus
+          type: prometheus
+          uid: {{ .Values.grafana.datasource.uid | default "prometheus" }}
+          url: http://{{ include "tc.v1.common.lib.chart.names.fullname" $ }}.{{ include "tc.v1.common.lib.metadata.namespace" (dict "rootCtx" $ "objectData" . "caller" "Configmap") }}:{{ .Values.service.main.ports.main.port }}
+          access: proxy
+          isDefault: {{ .Values.grafana.datasource.default | default true }}
+          jsonData:
+            httpMethod: {{ .Values.grafana.datasource.httpMethod | default "POST" }}
+            timeInterval: {{ .Values.grafana.datasource.scrapeInterval | default "30s" }}
+            {{- if .Values.grafana.datasource.timeout }}
+            timeout: {{ .Values.grafana.datasource.timeout }}
+            {{- end }}
+
+grafana:
+  datasource:
+    enabled: true
+    default: true
+    httpMethod: "POST"
+    scrapeInterval: "30s"
+    uid: "prometheus"
+
 service:
   main:
     selectorLabels:
@@ -30,7 +60,7 @@ service:
       prometheus: '{{ template "kube-prometheus.prometheus.fullname" . }}'
     ports:
       main:
-        port: 10086
+        port: 9090
         targetPort: 9090
         protocol: http
   alertmanager:
@@ -41,7 +71,7 @@ service:
     ports:
       alertmanager:
         enabled: true
-        port: 10087
+        port: 9093
         targetPort: 9093
         protocol: http
   thanos:
diff --git a/charts/operators/prometheus-operator/Chart.yaml b/charts/operators/prometheus-operator/Chart.yaml
index 65643d54768..f64f9b5b8b2 100644
--- a/charts/operators/prometheus-operator/Chart.yaml
+++ b/charts/operators/prometheus-operator/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: prometheus-operator
-version: 4.1.0
+version: 4.2.0
 appVersion: latest
 description: Prometheus Operator is an operator for prometheus
 home: https://truecharts.org/charts/operators/prometheus-operator
diff --git a/charts/operators/prometheus-operator/values.yaml b/charts/operators/prometheus-operator/values.yaml
index c1a8fae2185..98f9d1dc2b8 100644
--- a/charts/operators/prometheus-operator/values.yaml
+++ b/charts/operators/prometheus-operator/values.yaml
@@ -74,6 +74,7 @@ kps:
   ##
   grafana:
     enabled: false
+    forceDeployDashboards: true
 
   ## Flag to disable all the kubernetes component scrapers
   ##