diff --git a/modules/services/grafana/module.nix b/modules/services/grafana/module.nix
index 83d5b26..afeccb7 100644
--- a/modules/services/grafana/module.nix
+++ b/modules/services/grafana/module.nix
@@ -50,19 +50,19 @@ in {
         enable = true;
         datasources.settings = {
           datasources = [
-            (mkIf config.modules.system.services.database.postgresql.enable {
+            (mkIf config.modules.system.services.prometheus.enable {
               name = "Prometheus";
               type = "prometheus";
               access = "proxy";
-              url = "http://127.0.0.1:4024";
+              url = "http://127.0.0.1:${toString config.services.prometheus.port}";
               isDefault = true;
             })
 
-            (mkIf config.modules.system.services.prometheus.enable {
+            (mkIf config.modules.system.services.database.postgresql.enable {
               name = "PostgreSQL";
               type = "postgres";
               access = "proxy";
-              url = "http://127.0.0.1:${toString config.services.prometheus.port}";
+              url = "http://127.0.0.1:${toString config.services.prometheus.exporters.postgres.port}";
             })
           ];
         };