diff --git a/roles/grafana/templates/datasources.yaml.j2 b/roles/grafana/templates/datasources.yaml.j2
index c71602cb080a5016a9531aa142e717ea0612fd3e..073e1a15f4af7d9a5410ae6110f6648872998c20 100644
--- a/roles/grafana/templates/datasources.yaml.j2
+++ b/roles/grafana/templates/datasources.yaml.j2
@@ -19,4 +19,10 @@ datasources:
   type: loki
   access: proxy
   url: http://localhost:3100
+- name: Alertmanager
+  type: alertmanager
+  access: proxy
+  url: http://localhost:9093
+  jsonData:
+    implementation: prometheus
 {% endif %}
diff --git a/roles/grafana/templates/grafana.ini.j2 b/roles/grafana/templates/grafana.ini.j2
index c9bd9a057de5f796ce2fe4b821fcbf8c162585f6..e0103243ade4cefb0b9f4675e24e64258b16f6b0 100644
--- a/roles/grafana/templates/grafana.ini.j2
+++ b/roles/grafana/templates/grafana.ini.j2
@@ -716,7 +716,7 @@ mode = syslog
 #################################### Unified Alerting ####################
 [unified_alerting]
 #Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
-;enabled = false
+enabled = true
 
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
 ;disabled_orgs = 
@@ -940,7 +940,7 @@ enabled = false
 ;disable_sanitize_html = false
 
 [plugins]
-;enable_alpha = false
+enable_alpha = true
 ;app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
 ;allow_loading_unsigned_plugins =