diff --git a/monitor/alertmanager/datas.tf b/monitor/alertmanager/datas.tf
index a321f08..52ef0e6 100644
--- a/monitor/alertmanager/datas.tf
+++ b/monitor/alertmanager/datas.tf
@@ -28,17 +28,17 @@ data "kustomization_overlay" "data" {
   patches {
     target {
       kind = "Alertmanager"
-      name = "prometheus-community-kube-alertmanager"
+      name = "alertmanager-kube-promethe-alertmanager"
     }
     patch = <<-EOF
       apiVersion: monitoring.coreos.com/v1
       kind: Alertmanager
       metadata:
-        name: prometheus-community-kube-alertmanager
+        name: alertmanager-kube-promethe-alertmanager
       spec:
         image: "${var.images.alertmanager.registry}/${var.images.alertmanager.repository}:${var.images.alertmanager.tag}"
         version: ${var.images.alertmanager.tag}
-        externalUrl: http://alertmanager-operated.${var.namespace}:9093
+        externalUrl: http://${var.component}-${var.instance}.${var.namespace}:9093
         replicas: ${var.replicas}
         listenLocal: ${var.listenLocal}
         logLevel:  "${var.logLevel}"
@@ -72,7 +72,7 @@ data "kustomization_overlay" "data" {
   patches {
     target {
       kind = "ServiceMonitor"
-      name = "prometheus-community-kube-alertmanager"
+      name = "alertmanager-kube-promethe-alertmanager"
     }
     patch = <<-EOF
     - op: replace
@@ -83,13 +83,13 @@ data "kustomization_overlay" "data" {
   patches {
     target {
       kind = "PrometheusRule"
-      name = "prometheus-community-kube-alertmanager.rules"
+      name = "alertmanager-kube-promethe-alertmanager.rules"
     }
     patch = <<-EOF
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: prometheus-community-kube-alertmanager.rules
+  name: alertmanager-kube-promethe-alertmanager.rules
 spec:
   groups:
   - name: alertmanager.rules
@@ -98,53 +98,53 @@ spec:
       expr: |-
         # Without max_over_time, failed scrapes could create false negatives, see
         # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details.
-        max_over_time(alertmanager_config_last_reload_successful{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m]) == 0
+        max_over_time(alertmanager_config_last_reload_successful{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m]) == 0
     - alert: AlertmanagerMembersInconsistent
       expr: |-
         # Without max_over_time, failed scrapes could create false negatives, see
         # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details.
-          max_over_time(alertmanager_cluster_members{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m])
+          max_over_time(alertmanager_cluster_members{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m])
         < on (namespace,service,cluster) group_left
-          count by (namespace,service,cluster) (max_over_time(alertmanager_cluster_members{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m]))
+          count by (namespace,service,cluster) (max_over_time(alertmanager_cluster_members{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m]))
     - alert: AlertmanagerFailedToSendAlerts
       expr: |-
         (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m])
         )
         > 0.01
     - alert: AlertmanagerClusterFailedToSendAlerts
       expr: |-
         min by (namespace,service, integration) (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}", integration=~`.*`}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}", integration=~`.*`}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}", integration=~`.*`}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}", integration=~`.*`}[5m])
         )
         > 0.01
     - alert: AlertmanagerClusterFailedToSendAlerts
       expr: |-
         min by (namespace,service, integration) (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}", integration!~`.*`}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}", integration!~`.*`}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}", integration!~`.*`}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}", integration!~`.*`}[5m])
         )
         > 0.01
     - alert: AlertmanagerConfigInconsistent
       expr: |-
         count by (namespace,service,cluster) (
-          count_values by (namespace,service,cluster) ("config_hash", alertmanager_config_hash{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"})
+          count_values by (namespace,service,cluster) ("config_hash", alertmanager_config_hash{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"})
         )
         != 1
     - alert: AlertmanagerClusterDown
       expr: |-
         (
           count by (namespace,service,cluster) (
-            avg_over_time(up{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[5m]) < 0.5
+            avg_over_time(up{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[5m]) < 0.5
           )
         /
           count by (namespace,service,cluster) (
-            up{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}
+            up{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}
           )
         )
         >= 0.5
@@ -152,11 +152,11 @@ spec:
       expr: |-
         (
           count by (namespace,service,cluster) (
-            changes(process_start_time_seconds{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}[10m]) > 4
+            changes(process_start_time_seconds{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}[10m]) > 4
           )
         /
           count by (namespace,service,cluster) (
-            up{job="prometheus-community-kube-alertmanager",namespace="${var.namespace}"}
+            up{job="alertmanager-kube-promethe-alertmanager",namespace="${var.namespace}"}
           )
         )
         >= 0.5
diff --git a/monitor/alertmanager/index.yaml b/monitor/alertmanager/index.yaml
index fb480f2..081a43c 100644
--- a/monitor/alertmanager/index.yaml
+++ b/monitor/alertmanager/index.yaml
@@ -6,45 +6,30 @@ metadata:
   name: alertmanager
   description: null
 options:
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  sub-domain:
-    default: alertmanager
-    examples:
-    - alertmanager
-    type: string
-  retention:
-    default: 120h
-    examples:
-    - 120h
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   listenLocal:
     default: false
     examples:
     - false
     type: boolean
-  domain-name:
-    default: your_company.com
+  sub-domain:
+    default: alertmanager
     examples:
-    - your_company.com
+    - alertmanager
     type: string
   images:
     default:
@@ -85,16 +70,31 @@ options:
             type: string
         type: object
     type: object
-  replicas:
-    default: 1
+  retention:
+    default: 120h
     examples:
-    - 1
-    type: integer
+    - 120h
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
   logLevel:
     default: info
     examples:
     - info
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
 dependencies:
 - dist: null
   category: share
diff --git a/monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_prometheus-community-kube-alertmanager.yaml b/monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_alertmanager-kube-promethe-alertmanager.yaml
similarity index 75%
rename from monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_prometheus-community-kube-alertmanager.yaml
rename to monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_alertmanager-kube-promethe-alertmanager.yaml
index ef365f8..c2bc098 100644
--- a/monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_prometheus-community-kube-alertmanager.yaml
+++ b/monitor/alertmanager/monitoring.coreos.com_v1_Alertmanager_alertmanager-kube-promethe-alertmanager.yaml
@@ -2,25 +2,25 @@
 apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:
-  name: prometheus-community-kube-alertmanager
+  name: alertmanager-kube-promethe-alertmanager
   namespace: vynil-monitor
   labels:
     app: kube-prometheus-stack-alertmanager
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 spec:
   image: "quay.io/prometheus/alertmanager:v0.26.0"
   version: v0.26.0
   replicas: 1
   listenLocal: false
-  serviceAccountName: prometheus-community-kube-alertmanager
-  externalUrl: http://prometheus-community-kube-alertmanager.vynil-monitor:9093
+  serviceAccountName: alertmanager-kube-promethe-alertmanager
+  externalUrl: http://alertmanager-kube-promethe-alertmanager.vynil-monitor:9093
   paused: false
   logFormat: "logfmt"
   logLevel:  "info"
diff --git a/monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-alertmanager.rules.yaml b/monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_alertmanager-kube-promethe-alertmanager.rules.yaml
similarity index 77%
rename from monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-alertmanager.rules.yaml
rename to monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_alertmanager-kube-promethe-alertmanager.rules.yaml
index 366cd70..6aca347 100644
--- a/monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-alertmanager.rules.yaml
+++ b/monitor/alertmanager/monitoring.coreos.com_v1_PrometheusRule_alertmanager-kube-promethe-alertmanager.rules.yaml
@@ -2,17 +2,17 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: prometheus-community-kube-alertmanager.rules
+  name: alertmanager-kube-promethe-alertmanager.rules
   namespace: vynil-monitor
   labels:
     app: kube-prometheus-stack
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 spec:
   groups:
@@ -26,7 +26,7 @@ spec:
       expr: |-
         # Without max_over_time, failed scrapes could create false negatives, see
         # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details.
-        max_over_time(alertmanager_config_last_reload_successful{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m]) == 0
+        max_over_time(alertmanager_config_last_reload_successful{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m]) == 0
       for: 10m
       labels:
         severity: critical
@@ -38,9 +38,9 @@ spec:
       expr: |-
         # Without max_over_time, failed scrapes could create false negatives, see
         # https://www.robustperception.io/alerting-on-gauges-in-prometheus-2-0 for details.
-          max_over_time(alertmanager_cluster_members{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m])
+          max_over_time(alertmanager_cluster_members{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m])
         < on (namespace,service,cluster) group_left
-          count by (namespace,service,cluster) (max_over_time(alertmanager_cluster_members{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m]))
+          count by (namespace,service,cluster) (max_over_time(alertmanager_cluster_members{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m]))
       for: 15m
       labels:
         severity: critical
@@ -51,9 +51,9 @@ spec:
         summary: An Alertmanager instance failed to send notifications.
       expr: |-
         (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m])
         )
         > 0.01
       for: 5m
@@ -66,9 +66,9 @@ spec:
         summary: All Alertmanager instances in a cluster failed to send notifications to a critical integration.
       expr: |-
         min by (namespace,service, integration) (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor", integration=~`.*`}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor", integration=~`.*`}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor", integration=~`.*`}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor", integration=~`.*`}[5m])
         )
         > 0.01
       for: 5m
@@ -81,9 +81,9 @@ spec:
         summary: All Alertmanager instances in a cluster failed to send notifications to a non-critical integration.
       expr: |-
         min by (namespace,service, integration) (
-          rate(alertmanager_notifications_failed_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor", integration!~`.*`}[5m])
+          rate(alertmanager_notifications_failed_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor", integration!~`.*`}[5m])
         /
-          ignoring (reason) group_left rate(alertmanager_notifications_total{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor", integration!~`.*`}[5m])
+          ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor", integration!~`.*`}[5m])
         )
         > 0.01
       for: 5m
@@ -96,7 +96,7 @@ spec:
         summary: Alertmanager instances within the same cluster have different configurations.
       expr: |-
         count by (namespace,service,cluster) (
-          count_values by (namespace,service,cluster) ("config_hash", alertmanager_config_hash{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"})
+          count_values by (namespace,service,cluster) ("config_hash", alertmanager_config_hash{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"})
         )
         != 1
       for: 20m
@@ -110,11 +110,11 @@ spec:
       expr: |-
         (
           count by (namespace,service,cluster) (
-            avg_over_time(up{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[5m]) < 0.5
+            avg_over_time(up{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[5m]) < 0.5
           )
         /
           count by (namespace,service,cluster) (
-            up{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}
+            up{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}
           )
         )
         >= 0.5
@@ -129,11 +129,11 @@ spec:
       expr: |-
         (
           count by (namespace,service,cluster) (
-            changes(process_start_time_seconds{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}[10m]) > 4
+            changes(process_start_time_seconds{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}[10m]) > 4
           )
         /
           count by (namespace,service,cluster) (
-            up{job="prometheus-community-kube-alertmanager",namespace="vynil-monitor"}
+            up{job="alertmanager-kube-promethe-alertmanager",namespace="vynil-monitor"}
           )
         )
         >= 0.5
diff --git a/monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-alertmanager.yaml b/monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_alertmanager-kube-promethe-alertmanager.yaml
similarity index 80%
rename from monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-alertmanager.yaml
rename to monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_alertmanager-kube-promethe-alertmanager.yaml
index ff2e38b..bfe0415 100644
--- a/monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-alertmanager.yaml
+++ b/monitor/alertmanager/monitoring.coreos.com_v1_ServiceMonitor_alertmanager-kube-promethe-alertmanager.yaml
@@ -2,24 +2,24 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: prometheus-community-kube-alertmanager
+  name: alertmanager-kube-promethe-alertmanager
   namespace: vynil-monitor
   labels:
     app: kube-prometheus-stack-alertmanager
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 spec:
   
   selector:
     matchLabels:
       app: kube-prometheus-stack-alertmanager
-      release: "prometheus-community"
+      release: "alertmanager"
       self-monitor: "true"
   namespaceSelector:
     matchNames:
diff --git a/monitor/alertmanager/svc.tf b/monitor/alertmanager/svc.tf
new file mode 100644
index 0000000..c5220bb
--- /dev/null
+++ b/monitor/alertmanager/svc.tf
@@ -0,0 +1,33 @@
+locals {
+  svc-label = merge(local.common-labels, {
+      "app" = "kube-prometheus-stack-prometheus"
+      "release" = "prometheus"
+      "self-monitor" = "true"
+
+  })
+}
+resource "kubectl_manifest" "svc" {
+  yaml_body  = <<-EOF
+    apiVersion: v1
+    kind: Service
+    metadata:
+      name: "${var.component}-${var.instance}"
+      namespace: "${var.namespace}"
+      labels: ${jsonencode(local.svc-label)}
+    spec:
+      ports:
+      - name: http-web
+        port: 9093
+        targetPort: 9093
+        protocol: TCP
+      - name: reloader-web
+        appProtocol: http
+        port: 8080
+        targetPort: reloader-web
+      selector:
+        app.kubernetes.io/name: alertmanager
+        alertmanager: alertmanager-kube-promethe-alertmanager
+      sessionAffinity: None
+      type: "ClusterIP"
+  EOF
+}
diff --git a/monitor/alertmanager/v1_ConfigMap_prometheus-community-kube-alertmanager-overview.yaml b/monitor/alertmanager/v1_ConfigMap_alertmanager-kube-promethe-alertmanager-overview.yaml
similarity index 98%
rename from monitor/alertmanager/v1_ConfigMap_prometheus-community-kube-alertmanager-overview.yaml
rename to monitor/alertmanager/v1_ConfigMap_alertmanager-kube-promethe-alertmanager-overview.yaml
index e432bee..d3bb531 100644
--- a/monitor/alertmanager/v1_ConfigMap_prometheus-community-kube-alertmanager-overview.yaml
+++ b/monitor/alertmanager/v1_ConfigMap_alertmanager-kube-promethe-alertmanager-overview.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   namespace: vynil-monitor
-  name: prometheus-community-kube-alertmanager-overview
+  name: alertmanager-kube-promethe-alertmanager-overview
   annotations:
     {}
   labels:
@@ -11,11 +11,11 @@ metadata:
     app: kube-prometheus-stack-grafana
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 data:
   alertmanager-overview.json: |-
diff --git a/monitor/alertmanager/v1_Secret_alertmanager-prometheus-community-kube-alertmanager.yaml b/monitor/alertmanager/v1_Secret_alertmanager-alertmanager-kube-promethe-alertmanager.yaml
similarity index 90%
rename from monitor/alertmanager/v1_Secret_alertmanager-prometheus-community-kube-alertmanager.yaml
rename to monitor/alertmanager/v1_Secret_alertmanager-alertmanager-kube-promethe-alertmanager.yaml
index cbbb719..77b9eee 100644
--- a/monitor/alertmanager/v1_Secret_alertmanager-prometheus-community-kube-alertmanager.yaml
+++ b/monitor/alertmanager/v1_Secret_alertmanager-alertmanager-kube-promethe-alertmanager.yaml
@@ -2,17 +2,17 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: alertmanager-prometheus-community-kube-alertmanager
+  name: alertmanager-alertmanager-kube-promethe-alertmanager
   namespace: vynil-monitor
   labels:
     app: kube-prometheus-stack-alertmanager
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 data:
   alertmanager.yaml: "Z2xvYmFsOgogIHJlc29sdmVfdGltZW91dDogNW0KaW5oaWJpdF9ydWxlczoKLSBlcXVhbDoKICAtIG5hbWVzcGFjZQogIC0gYWxlcnRuYW1lCiAgc291cmNlX21hdGNoZXJzOgogIC0gc2V2ZXJpdHkgPSBjcml0aWNhbAogIHRhcmdldF9tYXRjaGVyczoKICAtIHNldmVyaXR5ID1+IHdhcm5pbmd8aW5mbwotIGVxdWFsOgogIC0gbmFtZXNwYWNlCiAgLSBhbGVydG5hbWUKICBzb3VyY2VfbWF0Y2hlcnM6CiAgLSBzZXZlcml0eSA9IHdhcm5pbmcKICB0YXJnZXRfbWF0Y2hlcnM6CiAgLSBzZXZlcml0eSA9IGluZm8KLSBlcXVhbDoKICAtIG5hbWVzcGFjZQogIHNvdXJjZV9tYXRjaGVyczoKICAtIGFsZXJ0bmFtZSA9IEluZm9JbmhpYml0b3IKICB0YXJnZXRfbWF0Y2hlcnM6CiAgLSBzZXZlcml0eSA9IGluZm8KLSB0YXJnZXRfbWF0Y2hlcnM6CiAgLSBhbGVydG5hbWUgPSBJbmZvSW5oaWJpdG9yCnJlY2VpdmVyczoKLSBuYW1lOiAibnVsbCIKcm91dGU6CiAgZ3JvdXBfYnk6CiAgLSBuYW1lc3BhY2UKICBncm91cF9pbnRlcnZhbDogNW0KICBncm91cF93YWl0OiAzMHMKICByZWNlaXZlcjogIm51bGwiCiAgcmVwZWF0X2ludGVydmFsOiAxMmgKICByb3V0ZXM6CiAgLSBtYXRjaGVyczoKICAgIC0gYWxlcnRuYW1lID0gIldhdGNoZG9nIgogICAgcmVjZWl2ZXI6ICJudWxsIgp0ZW1wbGF0ZXM6Ci0gL2V0Yy9hbGVydG1hbmFnZXIvY29uZmlnLyoudG1wbA=="
\ No newline at end of file
diff --git a/monitor/alertmanager/v1_ServiceAccount_prometheus-community-kube-alertmanager.yaml b/monitor/alertmanager/v1_ServiceAccount_alertmanager-kube-promethe-alertmanager.yaml
similarity index 80%
rename from monitor/alertmanager/v1_ServiceAccount_prometheus-community-kube-alertmanager.yaml
rename to monitor/alertmanager/v1_ServiceAccount_alertmanager-kube-promethe-alertmanager.yaml
index 60bfedd..9296671 100644
--- a/monitor/alertmanager/v1_ServiceAccount_prometheus-community-kube-alertmanager.yaml
+++ b/monitor/alertmanager/v1_ServiceAccount_alertmanager-kube-promethe-alertmanager.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: prometheus-community-kube-alertmanager
+  name: alertmanager-kube-promethe-alertmanager
   namespace: vynil-monitor
   labels:
     app: kube-prometheus-stack-alertmanager
@@ -11,10 +11,10 @@ metadata:
     app.kubernetes.io/component: alertmanager
     
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: prometheus-community
+    app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/version: "56.0.3"
     app.kubernetes.io/part-of: kube-prometheus-stack
     chart: kube-prometheus-stack-56.0.3
-    release: "prometheus-community"
+    release: "alertmanager"
     heritage: "Helm"
 automountServiceAccountToken: true
\ No newline at end of file
diff --git a/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml b/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml
new file mode 100644
index 0000000..15c6b00
--- /dev/null
+++ b/monitor/alertmanager/v1_Service_alertmanager-kube-promethe-alertmanager.yaml
@@ -0,0 +1,32 @@
+# Source: kube-prometheus-stack/templates/alertmanager/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: alertmanager-kube-promethe-alertmanager
+  namespace: vynil-monitor
+  labels:
+    app: kube-prometheus-stack-alertmanager
+    self-monitor: "true"
+    
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/instance: alertmanager
+    app.kubernetes.io/version: "56.0.3"
+    app.kubernetes.io/part-of: kube-prometheus-stack
+    chart: kube-prometheus-stack-56.0.3
+    release: "alertmanager"
+    heritage: "Helm"
+spec:
+  ports:
+  - name: http-web
+    port: 9093
+    targetPort: 9093
+    protocol: TCP
+  - name: reloader-web
+    appProtocol: http
+    port: 8080
+    targetPort: reloader-web
+  selector:
+    app.kubernetes.io/name: alertmanager
+    alertmanager: alertmanager-kube-promethe-alertmanager
+  sessionAffinity: None
+  type: "ClusterIP"
\ No newline at end of file
diff --git a/monitor/prometheus/index.yaml b/monitor/prometheus/index.yaml
index 948e64a..391b644 100644
--- a/monitor/prometheus/index.yaml
+++ b/monitor/prometheus/index.yaml
@@ -6,41 +6,21 @@ metadata:
   name: prometheus
   description: null
 options:
-  app-group:
-    default: monitor
+  domain-name:
+    default: your_company.com
     examples:
-    - monitor
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  listenLocal:
-    default: false
-    examples:
-    - false
-    type: boolean
-  enableAdminAPI:
-    default: false
-    examples:
-    - false
-    type: boolean
-  retention:
-    default: 10d
-    examples:
-    - 10d
-    type: string
-  logLevel:
-    default: info
-    examples:
-    - info
+    - your_company.com
     type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   images:
     default:
       prometheus:
@@ -80,30 +60,50 @@ options:
             type: string
         type: object
     type: object
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
   shards:
     default: 1
     examples:
     - 1
     type: integer
-  domain-name:
-    default: your_company.com
+  logLevel:
+    default: info
     examples:
-    - your_company.com
+    - info
     type: string
-  issuer:
-    default: letsencrypt-prod
+  listenLocal:
+    default: false
     examples:
-    - letsencrypt-prod
+    - false
+    type: boolean
+  enableAdminAPI:
+    default: false
+    examples:
+    - false
+    type: boolean
+  retention:
+    default: 10d
+    examples:
+    - 10d
     type: string
   sub-domain:
     default: prometheus
     examples:
     - prometheus
     type: string
-  ingress-class:
-    default: traefik
+  issuer:
+    default: letsencrypt-prod
     examples:
-    - traefik
+    - letsencrypt-prod
     type: string
 dependencies:
 - dist: null
diff --git a/monitor/prometheus/prometheus.tf b/monitor/prometheus/prometheus.tf
index 106a0a2..6d41341 100644
--- a/monitor/prometheus/prometheus.tf
+++ b/monitor/prometheus/prometheus.tf
@@ -9,7 +9,7 @@ resource "kubectl_manifest" "prometheus" {
     spec:
       image: "${var.images.prometheus.registry}/${var.images.prometheus.repository}:${var.images.prometheus.tag}"
       version: ${var.images.prometheus.tag}
-      externalUrl: http://prometheus-operated.${var.namespace}:9090
+      externalUrl: http://${var.component}-${var.instance}.${var.namespace}:9090
       replicas: ${var.replicas}
       shards: ${var.shards}
       logLevel:  ${var.logLevel}
@@ -23,7 +23,7 @@ resource "kubectl_manifest" "prometheus" {
       alerting:
         alertmanagers:
           - namespace: ${var.namespace}
-            name: prometheus-community-kube-alertmanager
+            name: alertmanager-alertmanager
             port: http-web
             pathPrefix: "/"
             apiVersion: v2