diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 22269a4..39ddbb8 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -42,7 +42,7 @@ services:
     volumes:
       - grafana-data:/var/lib/grafana
     ports:
-      - 3000:3000
+      - 3001:3000
   status-page:
     restart: unless-stopped
     build:
diff --git a/grafana/provisioning/dashboards/email.dashboard.py b/grafana/provisioning/dashboards/email.dashboard.py
new file mode 100644
index 0000000..bf991fc
--- /dev/null
+++ b/grafana/provisioning/dashboards/email.dashboard.py
@@ -0,0 +1,39 @@
+from wrapper import SceGrafanalibWrapper, ExpressionAndLegendPair
+from grafanalib.formatunits import NUMBER_FORMAT
+
+wrapper = SceGrafanalibWrapper("Email Tracking")
+
+wrapper.DefineRow("Current Time")
+wrapper.AddPanel(
+    title="Current Epoch Time",
+    queries=[
+        ExpressionAndLegendPair(
+            'current_epoch_time{app="sce-core"}',
+            'Current Epoch Time'
+        )
+    ],
+)
+
+wrapper.DefineRow("Refresh Token Expired")
+wrapper.AddPanel(
+    title="Refresh Token Refreshed",
+    queries=[
+        ExpressionAndLegendPair(
+            'google_cloud_refresh_token_epoch{app="sce-core"}',
+            'Refresh token expired and refreshed'
+        )
+    ],
+)
+
+wrapper.DefineRow("Email Sent")
+wrapper.AddPanel(
+    title="Total Emails Sent",
+    queries=[
+        ExpressionAndLegendPair(
+            'email_sent{type="verification"}',
+            'Total Auth Emails'
+        )
+    ],
+    unit=NUMBER_FORMAT,
+)
+dashboard = wrapper.Render()
diff --git a/grafana/provisioning/datasources/all.dev.yml b/grafana/provisioning/datasources/all.dev.yml
index 2017cf9..9a955ac 100644
--- a/grafana/provisioning/datasources/all.dev.yml
+++ b/grafana/provisioning/datasources/all.dev.yml
@@ -4,4 +4,4 @@ datasources:
   - name: Prometheus
     type: prometheus
     access: proxy
-    url: "http://one.sce/prometheus"
+    url: "http://prometheus-federated:9090"
diff --git a/prometheus/prometheus.federate.yml b/prometheus/prometheus.federate.yml
index 3257ac9..1100c9a 100644
--- a/prometheus/prometheus.federate.yml
+++ b/prometheus/prometheus.federate.yml
@@ -13,6 +13,9 @@ scrape_configs:
       - targets: 
         - prometheus-clark-sshtunnel:9090
         - prometheus-poweredge:9090
+  - job_name: 'email-service'
+    static_configs:
+    - targets: ['host.docker.internal:8082']
 
 alerting:
   alertmanagers: