diff --git a/modules/server/containers/default.nix b/modules/server/containers/default.nix
new file mode 100644
index 0000000..c3a41f3
--- /dev/null
+++ b/modules/server/containers/default.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  ...
+}:
+{
+  imports = [
+    ./remnawave.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    compose2nix
+    podman-tui
+  ];
+}
diff --git a/modules/server/containers/remnawave.nix b/modules/server/containers/remnawave.nix
new file mode 100644
index 0000000..1131946
--- /dev/null
+++ b/modules/server/containers/remnawave.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  xlib,
+  ...
+}:
+{
+
+
+  # fileSystems."${config.services.immich.mediaLocation}" = {
+  #   device = "${xlib.dirs.services-folder}/immich";
+  #   options = [
+  #     "bind"
+  #     "nofail"
+  #   ];
+  # };
+
+  # systemd.tmpfiles.rules = [
+  #   "z ${config.services.immich.mediaLocation} 0755 immich immich -"
+  # ];
+
+  # environment = {
+  #   systemPackages = with pkgs; [
+  #     immich-cli
+  #   ];
+  # };
+}
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 050c3bd..7e01ee4 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -6,6 +6,7 @@
   imports = [
     ../software/beets
     ./calibre-web.nix
+    ./containers
     ./immich.nix
     ./miniflux.nix
     ./nextcloud.nix
@@ -18,11 +19,11 @@
     ./systemd.nix
     ./transmission.nix
     ./uptime-kuma.nix
-    # ./rsync.nix
-    # ./nfs.nix
     # ./mealie.nix
     # ./memos.nix
+    # ./nfs.nix
     # ./node-red.nix
+    # ./rsync.nix
     # ./trilium.nix
     # ./zerotier.nix
   ];
diff --git a/modules/vds/3x-ui.nix b/modules/vds/containers/3x-ui.nix
similarity index 100%
rename from modules/vds/3x-ui.nix
rename to modules/vds/containers/3x-ui.nix
diff --git a/modules/vds/containers.nix b/modules/vds/containers/default.nix
similarity index 100%
rename from modules/vds/containers.nix
rename to modules/vds/containers/default.nix
diff --git a/modules/vds/default.nix b/modules/vds/default.nix
index 60f36d1..93ba1e7 100644
--- a/modules/vds/default.nix
+++ b/modules/vds/default.nix
@@ -4,10 +4,10 @@
 }:
 {
   imports = [
-    ./containers.nix
-    # ../services/uptime-kuma.nix
-    # ./netbird.nix
+    ./containers
     ./nginx.nix
     ./xray.nix
+    # ../services/uptime-kuma.nix
+    # ./netbird.nix
   ];
 }