diff --git a/nixos/hosts/hades/storage/configuration.nix b/nixos/hosts/hades/storage/configuration.nix
index 25c646cd..4949038f 100644
--- a/nixos/hosts/hades/storage/configuration.nix
+++ b/nixos/hosts/hades/storage/configuration.nix
@@ -22,7 +22,11 @@
     snapraid = {
       enable = true;
       parityFiles =
-        [ "/mnt/parity1/snapraid.parity" "/mnt/parity2/snapraid.parity-2" ];
+        [
+        "/mnt/parity1/snapraid.parity"
+        "/mnt/parity2/snapraid.parity-2"
+        "/mnt/parity3/snapraid.parity-3"
+        ];
       dataDisks = {
         d1 = "/mnt/disk1";
         d2 = "/mnt/disk2";
diff --git a/nixos/hosts/hades/storage/fs.nix b/nixos/hosts/hades/storage/fs.nix
index d3f3f880..27aec097 100644
--- a/nixos/hosts/hades/storage/fs.nix
+++ b/nixos/hosts/hades/storage/fs.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
 
-  environment.systemPackages = with pkgs; [ mergerfs mergerfs-tools ];
+  environment.systemPackages = with pkgs; [ mergerfs mergerfs-tools smartmontools ];
   fileSystems = {
     "/mnt/disk1" = {
       fsType = "ext4";
@@ -42,6 +42,11 @@
       device = "/dev/disk/by-uuid/6c568887-9d2e-45ce-ab85-4c48cca2226a";
     };
 
+    "/mnt/parity3" = {
+      fsType = "ext4";
+      device = "/dev/disk/by-partuuid/5d2d7e3e-3730-4d9b-8759-dc14396f3357";
+    };
+
     "/mnt/storage" = {
       fsType = "fuse.mergerfs";
       device = "/mnt/disk*";
diff --git a/nixos/hosts/olympus/bastion/containers/common.nix b/nixos/hosts/olympus/bastion/containers/common.nix
new file mode 100644
index 00000000..56ccdd5e
--- /dev/null
+++ b/nixos/hosts/olympus/bastion/containers/common.nix
@@ -0,0 +1,6 @@
+# common container config
+{ lib, ... }: {
+  # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
+  networking.useHostResolvConf = lib.mkForce false;
+  services.resolved.enable = true;
+}
diff --git a/nixos/hosts/olympus/bastion/containers/default.nix b/nixos/hosts/olympus/bastion/containers/default.nix
index 5195deb7..d2e8299d 100644
--- a/nixos/hosts/olympus/bastion/containers/default.nix
+++ b/nixos/hosts/olympus/bastion/containers/default.nix
@@ -1,4 +1,8 @@
-{ lib, ... }: {
+{ config, lib, ... }:
+let
+  hostAddress = "10.42.99.1";
+  hostAddress6 = "fc00::1";
+in {
   # TODO: Loop over subdirs, create nixos container for each
   networking.nat = {
     enable = true;
@@ -6,25 +10,17 @@
     externalInterface = "ens18";
     # Lazy IPv6 connectivity for the container
     enableIPv6 = true;
+
+    forwardPorts = [
+
+    ];
   };
 
   # Containers network is
   # * 10.42.99.0/24
   # * fc00:x
 
-  containers.monitoring = {
-    autoStart = true;
-    privateNetwork = true;
-    hostAddress = "10.42.99.1";
-    localAddress = "10.42.99.2";
-    hostAddress6 = "fc00::1";
-    localAddress6 = "fc00::2";
+  containers = {
 
-    config = {
-      imports = [ ./monitoring ];
-      # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
-      networking.useHostResolvConf = lib.mkForce false;
-      services.resolved.enable = true;
-    };
   };
 }
diff --git a/nixos/hosts/olympus/bastion/containers/monitoring/default.nix b/nixos/hosts/olympus/bastion/containers/monitoring/default.nix
deleted file mode 100644
index e4e6a762..00000000
--- a/nixos/hosts/olympus/bastion/containers/monitoring/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  imports = [
-    ./grafana.nix
-  ];
-}
diff --git a/nixos/hosts/olympus/bastion/containers/monitoring/grafana.nix b/nixos/hosts/olympus/bastion/containers/monitoring/grafana.nix
deleted file mode 100644
index 81a6c982..00000000
--- a/nixos/hosts/olympus/bastion/containers/monitoring/grafana.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ... }: {
-  services.grafana = {
-    enable = true;
-    domain = "grafana.olympus";
-    port = 80;
-    addr = "0.0.0.0";
-  };
-
-  networking.firewall.allowedTCPPorts = [ config.services.grafana.port ];
-}
diff --git a/nixos/hosts/olympus/victoriametrics/configuration.nix b/nixos/hosts/olympus/victoriametrics/configuration.nix
index f565f79a..8ad22cb4 100644
--- a/nixos/hosts/olympus/victoriametrics/configuration.nix
+++ b/nixos/hosts/olympus/victoriametrics/configuration.nix
@@ -8,8 +8,7 @@ let
   grafanaDomain = config.meta.exposes.grafana.domain;
   grafanaPort = config.meta.exposes.grafana.port;
   vs = config.vault-secrets.secrets;
-in
-{
+in {
   imports = [ ];
 
   # This value determines the NixOS release from which the default
@@ -115,9 +114,8 @@ in
           token_url = "https://dex.0x76.dev/token";
           api_url = "https://dex.0x76.dev/userinfo";
           skip_org_role_sync = true;
-          auto_login = true;
+          auto_login = false;
         };
-
       };
     };
   };