diff --git a/modules/services/system-logging/prometheus-server.nix b/modules/services/system-logging/prometheus-server.nix
index 9aea98c..337604f 100644
--- a/modules/services/system-logging/prometheus-server.nix
+++ b/modules/services/system-logging/prometheus-server.nix
@@ -1,18 +1,39 @@
+{ lib, ... }:
+let
+  #grafanaPort = lib.custom.autoport "grafana";
+  grafanaPort = 3000;
+in
 {
-  services.prometheus = {
-    enable = true;
-    scrapeConfigs = [
-      {
-        job_name = "prometheus";
-        scrape_interval = "5s";
-        static_configs = [
-          {
-            targets = [
-              "localhost:9090"
-            ];
-          }
-        ];
-      }
-    ];
+  services = {
+    prometheus = {
+      enable = true;
+      globalConfig = {
+        scrape_interval = "15s";
+        evaluation_interval = "15s";
+      };
+      scrapeConfigs = [
+        {
+          job_name = "prometheus";
+          static_configs = [
+            {
+              targets = [ "localhost:9090" ];
+            }
+          ];
+        }
+      ];
+    };
+
+    #grafana = {
+    #  enable = true;
+    #  settings = {
+    #    server = {
+    #      http_addr = "0.0.0.0";
+    #      http_port = grafanaPort;
+    #      enable_gzip = true;
+    #      domain = "localhost";
+    #    };
+    #    analytics.reporting_enabled = false;
+    #  };
+    #};
   };
 }
diff --git a/modules/services/system-logging/proxy.nix b/modules/services/system-logging/proxy.nix
deleted file mode 100644
index 31ead83..0000000
--- a/modules/services/system-logging/proxy.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}:
-{
-  services.caddy = {
-    enable = true;
-    virtualHosts."logs.wanderingcrow.net".extraConfig = ''
-      reverse_proxy http://${builtins.toString config.services.grafana.settings.server.http_addr}:${builtins.toString config.services.grafana.settings.server.http_port}
-    '';
-  };
-}