diff --git a/hosts/nixos/thinkpad/containers.nix b/hosts/nixos/thinkpad/containers.nix
new file mode 100644
index 0000000..5594b49
--- /dev/null
+++ b/hosts/nixos/thinkpad/containers.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, lib, ... }:
+
+let
+  # Universal container configuration
+  commonUID = "1000";
+  commonGID = "100";
+  systemTZ = config.time.timeZone;
+in
+{
+  # Container definitions for thinkpad host
+  virtualisation.oci-containers.containers = {
+    # Add container definitions here as needed
+  };
+}
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index ddce155..b75ff5b 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -1,8 +1,10 @@
 { config, pkgs, lib, ... }: {
   imports = [
     ./hardware-configuration.nix
+    ./containers.nix  # Host-specific container definitions
     ../system-default.nix  # Common NixOS system configuration
     ../../../modules/wireguard.nix
+    ../../../modules/podman.nix
     ../../../modules/borg-server.nix
     ../../../modules/smart-report.nix
   ];