diff --git a/modules/kubernetes/monitoring/main.tf b/modules/kubernetes/monitoring/main.tf
index 625d93f4..e74afde3 100644
--- a/modules/kubernetes/monitoring/main.tf
+++ b/modules/kubernetes/monitoring/main.tf
@@ -68,7 +68,8 @@ resource "helm_release" "prometheus" {
 
   repository = "https://prometheus-community.github.io/helm-charts"
   chart      = "prometheus"
-  version    = "15.0.2"
+  # version    = "15.0.2"
+  version = "25.8.2"
 
   values = [templatefile("${path.module}/prometheus_chart_values.tpl", { alertmanager_mail_pass = var.alertmanager_account_password, alertmanager_slack_api_url = var.alertmanager_slack_api_url })]
 }
@@ -176,6 +177,24 @@ resource "kubernetes_persistent_volume" "prometheus_grafana_pv" {
     }
   }
 }
+
+resource "kubernetes_persistent_volume" "alertmanager_pv" {
+  metadata {
+    name = "alertmanager-pv"
+  }
+  spec {
+    capacity = {
+      "storage" = "2Gi"
+    }
+    access_modes = ["ReadWriteOnce"]
+    persistent_volume_source {
+      nfs {
+        path   = "/mnt/main/alertmanager"
+        server = "10.0.10.15"
+      }
+    }
+  }
+}
 resource "kubernetes_persistent_volume_claim" "prometheus_grafana_pvc" {
   metadata {
     name      = "grafana-iscsi-pvc"
diff --git a/modules/kubernetes/monitoring/prometheus_chart_values.tpl b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
index dd5e9b4d..f3cfb5ec 100644
--- a/modules/kubernetes/monitoring/prometheus_chart_values.tpl
+++ b/modules/kubernetes/monitoring/prometheus_chart_values.tpl
@@ -2,13 +2,14 @@
 # all values - https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml
 alertmanager:
   persistentVolume:
-    enabled: false
+    enabled: true
+    existingClaim: alertmanager-pvc
     #existingClaim: alertmanager-iscsi-pvc
     # storageClass: rook-cephfs
   strategy:
     type: Recreate
   ingress:
-    enabled: "true"
+    enabled: true
     annotations:
       kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
@@ -23,7 +24,16 @@ alertmanager:
         hosts:
           - "alertmanager.viktorbarzin.me"
     hosts:
-      - "alertmanager.viktorbarzin.me"
+      # - alertmanager.viktorbarzin.me
+      - host: alertmanager.viktorbarzin.me
+        paths:
+          - path: /
+            pathType: Prefix
+            serviceName: prometheus-server
+            servicePort: 80
+  # web.external-url seems to be hardcoded, edited deployment manually
+  # extraArgs:
+  #   web.external-url: "https://prometheus.viktorbarzin.me"
 alertmanagerFiles:
   alertmanager.yml:
     global:
@@ -68,7 +78,7 @@ server:
     type: Recreate
   baseURL: "https://prometheus.viktorbarzin.me"
   ingress:
-    enabled: "true"
+    enabled: true
     annotations:
       kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
diff --git a/terraform.tfstate b/terraform.tfstate
index 72d76f4c..fcb2bd5f 100644
Binary files a/terraform.tfstate and b/terraform.tfstate differ