diff --git a/components/monitor/container.nix b/components/monitor/container.nix
deleted file mode 100644
index 86a38db..0000000
--- a/components/monitor/container.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  config,
-  inputs,
-  ...
-}:
-with lib;
-with types;
-{
-  imports = [
-    ../timezone.nix
-  ];
-
-  config = {
-    telemetry.enable = mkDefault true;
-    telemetry.metrics.enable = mkDefault false;
-    telemetry.apps.opentelemetry.enable = false;
-    services.journald.extraConfig = "SystemMaxUse=1G";
-  };
-
-}
diff --git a/flake.lock b/flake.lock
index 88611ae..80145a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1405,11 +1405,11 @@
         "treefmt-nix": "treefmt-nix_8"
       },
       "locked": {
-        "lastModified": 1740622764,
-        "narHash": "sha256-QJM3S7f4EZ1lCit+4Kl/SN6ZGAdQXv4rPc5EFL0Vq0w=",
+        "lastModified": 1740624189,
+        "narHash": "sha256-GET3URhKXO5uq62tAPr9xSe6fSco1m0+p1UvK9iAukM=",
         "owner": "mrvandalo",
         "repo": "nixos-telemetry",
-        "rev": "603a221b21b65ff102ff61ef87a0a5bb8d47c06d",
+        "rev": "bb8713fc2cd19c316c051fa1e643a36531c12364",
         "type": "github"
       },
       "original": {
diff --git a/machines/orbi/media-nextcloud.nix b/machines/orbi/media-nextcloud.nix
index 464a21f..7607a47 100644
--- a/machines/orbi/media-nextcloud.nix
+++ b/machines/orbi/media-nextcloud.nix
@@ -114,9 +114,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
diff --git a/machines/orbi/media-transmission2.nix b/machines/orbi/media-transmission2.nix
index b27e2ab..b667756 100644
--- a/machines/orbi/media-transmission2.nix
+++ b/machines/orbi/media-transmission2.nix
@@ -35,9 +35,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "21.05";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
diff --git a/machines/orbi/service-forgejo.nix b/machines/orbi/service-forgejo.nix
index afacf4d..573e213 100644
--- a/machines/orbi/service-forgejo.nix
+++ b/machines/orbi/service-forgejo.nix
@@ -60,9 +60,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "24.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
diff --git a/machines/orbi/service-photoprism.nix b/machines/orbi/service-photoprism.nix
index b1f1582..00723fa 100644
--- a/machines/orbi/service-photoprism.nix
+++ b/machines/orbi/service-photoprism.nix
@@ -34,9 +34,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
diff --git a/machines/orbi/service-surrealdb.nix b/machines/orbi/service-surrealdb.nix
index fb7588c..6f88aeb 100644
--- a/machines/orbi/service-surrealdb.nix
+++ b/machines/orbi/service-surrealdb.nix
@@ -25,9 +25,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "24.05";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here
diff --git a/machines/orbi/social-matrix-terranix.nix b/machines/orbi/social-matrix-terranix.nix
index 180a7db..f8df7db 100644
--- a/machines/orbi/social-matrix-terranix.nix
+++ b/machines/orbi/social-matrix-terranix.nix
@@ -90,9 +90,8 @@ in
       {
         nixpkgs.pkgs = pkgs;
         imports = [
-          "${components}/monitor/container.nix"
           inputs.nix-topology.nixosModules.default
-          inputs.telemetry.nixosModules.telemetry
+          inputs.telemetry.nixosModules.container-telemetry-non-private-network
         ];
         system.stateVersion = "23.11";
         services.logrotate.checkConfig = false; # because uid 3000 does not exist in here