diff --git a/config/monitoring/alertmanager/config/alertmanager.yml b/config/monitoring/alertmanager/config/alertmanager.yml
index d33e1d395..4908f2377 100644
--- a/config/monitoring/alertmanager/config/alertmanager.yml
+++ b/config/monitoring/alertmanager/config/alertmanager.yml
@@ -1,13 +1,12 @@
-# This is an example alertmanager.yaml which sends alert notifications to a slack channel.
+# This is an example alertmanager.yml which sends alert notifications to a slack channel.
 
 global:
-  slack_api_url: "https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX"
+  slack_api_url: "https://hooks.slack.com/services/TXXXXXXXX/XXXXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX"
 route:
-  group_by: ['alertname', 'cluster', 'service']
-  receiver: slack_general
+  group_by: ['cluster', 'service']
+  receiver: slack_user
 
 receivers:
-  - name: slack_general
+  - name: slack_user
     slack_configs:
-      - channel: '#channel'
-        text: "summary: {{ .CommonAnnotations.summary }}\ndescription: {{ .CommonAnnotations.description }}"
\ No newline at end of file
+        - text: "summary: {{ .CommonAnnotations.summary }}\ndescription: {{ .CommonAnnotations.description }}"
\ No newline at end of file
diff --git a/config/monitoring/grafana/config/aerospike_grafana_datasource.yaml b/config/monitoring/grafana/config/aerospike_grafana_datasource.yaml
index eac7d7bd4..968b2a660 100644
--- a/config/monitoring/grafana/config/aerospike_grafana_datasource.yaml
+++ b/config/monitoring/grafana/config/aerospike_grafana_datasource.yaml
@@ -3,7 +3,6 @@ datasources:
   - name: "Aerospike Prometheus"
     type: prometheus
     access: proxy
-    # orgId: 1
     url: http://aerospike-monitoring-stack-prometheus:9090
     editable: true
     isDefault: false
\ No newline at end of file
diff --git a/helm-charts/aerospike-kubernetes-operator/values.yaml b/helm-charts/aerospike-kubernetes-operator/values.yaml
index 3bca6fac6..53c8c5abd 100644
--- a/helm-charts/aerospike-kubernetes-operator/values.yaml
+++ b/helm-charts/aerospike-kubernetes-operator/values.yaml
@@ -28,7 +28,7 @@ certs:
   webhookServerCertSecretName: "webhook-server-cert"
 
 ##  Operator configurations
-watchNamespaces: "default"
+watchNamespaces: "default,aerospike"
 
 # Registry used to pull aerospike-init image
 aerospikeKubernetesInitRegistry: "docker.io"