diff --git a/roles/prometheus-grafana/defaults/main.yml b/roles/prometheus-grafana/defaults/main.yml
index c6a0049..a602cf8 100644
--- a/roles/prometheus-grafana/defaults/main.yml
+++ b/roles/prometheus-grafana/defaults/main.yml
@@ -4,3 +4,7 @@ dashboard_folders:
   - container
   - cache
   - server
+
+grafana_password: "{{ lookup('env', 'GRAFANA_PASSWORD') | default('change-me-password', true) }}"
+slack_webhook_url: "{{ lookup('env', 'SLACK_WEBHOOK_URL') | default('', true) }}"
+discord_webhook_url: "{{ lookup('env', 'DISCORD_WEBHOOK_URL') | default('', true }}"
diff --git a/roles/prometheus-grafana/tasks/grafana.yml b/roles/prometheus-grafana/tasks/grafana.yml
index a88f1e2..4f2bf6a 100644
--- a/roles/prometheus-grafana/tasks/grafana.yml
+++ b/roles/prometheus-grafana/tasks/grafana.yml
@@ -84,5 +84,5 @@
     networks:
       - name: monitoring
     env:
-      GF_SECURITY_ADMIN_PASSWORD: "{{ env_vars.GRAFANA_PASSWORD }}" # Customize the password
+      GF_SECURITY_ADMIN_PASSWORD: "{{ grafana_password }}" # Customize the password
 
diff --git a/roles/prometheus-grafana/tasks/main.yml b/roles/prometheus-grafana/tasks/main.yml
index 040f5e4..d437a72 100644
--- a/roles/prometheus-grafana/tasks/main.yml
+++ b/roles/prometheus-grafana/tasks/main.yml
@@ -1,7 +1,4 @@
 ---
-# ensure we have variables from .env files
-- include_tasks: ../roles/env/tasks/main.yml
-
 - include_tasks: monitoring-network.yml
 - include_tasks: prometheus.yml
 - include_tasks: grafana.yml
diff --git a/roles/prometheus-grafana/templates/grafana-alerting/contactPoints.yml.j2 b/roles/prometheus-grafana/templates/grafana-alerting/contactPoints.yml.j2
index 63194c8..1ad453e 100644
--- a/roles/prometheus-grafana/templates/grafana-alerting/contactPoints.yml.j2
+++ b/roles/prometheus-grafana/templates/grafana-alerting/contactPoints.yml.j2
@@ -6,11 +6,11 @@ contactPoints:
         - uid: beeuk6rhszaiof
           type: slack
           settings:
-            url: {{ env_vars.SLACK_WEBHOOK_URL }}
+            url: {{ slack_webhook_url }}
           disableResolveMessage: false
         - uid: eewvrxp9d14w0a
           type: webhook
           settings:
             httpMethod: POST
-            url: {{ env_vars.DISCORD_WEBHOOK_URL }}
+            url: {{ discord_webhook_url }}
           disableResolveMessage: false