diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix
index 2540b81..b8d5e92 100644
--- a/system/hosts/sail.nix
+++ b/system/hosts/sail.nix
@@ -3,6 +3,11 @@
 {
   imports = [
     ../../hardware/hosts/sail.nix
+
+    ../nixos/ssh.nix
+
+    ../nixos/arion.nix
+    ../nixos/git.nix
   ];
 
   nix = {
@@ -30,10 +35,6 @@
 
   networking.hostName = "sail";
 
-  services.openssh.enable = true;
-
-  programs.git.enable = true;
-
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTRKrX0wVWoauI+dSfFpKIr7qwh8imrp1OVlxWyCuFssZI2o6chmRBZq4EbOkVvfdgdOGJ4hTSwQOTwusZVrZHwxtinusX5c2M3HMrhMvLFAYh2vKrvP5UZBTA/7laenSM6uLGxrM2CNc+G8ryAyY7dLoU2xaXiqgcfC6MaU/leTMTXWH5fHvqUk2pxI4ihObTGiDE5kvvFbv3AhFFtcMmkzdHN1vlVp8olKG0lYOLM9O3PpVGJtiOTA2Z9YuTC44iH984HPmk3KkJsK/PZFI1d4K7oW7298w44pszElGwjIW0GyB7X4qo6yOxsq1OsL/c7T9VHWVw3na2QvAJODBNM8rYGMACo8oSEThRsi1hhXPe7MhLPqwhn3OHbbofupbqk7WpKVaMLrO7793DgNatPNhGgbz9WtVCC65YPY3De3sowsh4M4u0HC5lRg0IgjBMgUjMAHWqcxytYRUKPRrdKbcaoOoMquMnja+bcLfHxVOkcLMgEfzPtjxgZCvenUsy0Q73dwxAtJx73xscMZUWb/LbkLWoOzAh3jjyjIeZeT8ZyIOhfcgoxLFE4Ik7eIiszEg0xQ7jXzR+K3RL+2O93RvNTvc5WaDVypiL6Zics30EZAYMYtBoY69a1PxeJ42sLp3O35QNFbwfN4cnsx9YXgvUmTcwCijU/LbvNAgl2Q=="
   ];
diff --git a/system/nixos/arion.nix b/system/nixos/arion.nix
new file mode 100644
index 0000000..f04e8e8
--- /dev/null
+++ b/system/nixos/arion.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    pkgs.arion
+    pkgs.docker-client
+  ];
+
+  virtualisation.docker.enable = false;
+  virtualisation.podman.enable = true;
+  virtualisation.podman.dockerSocket.enable = true;
+  virtualisation.podman.defaultNetwork.dnsname.enable = true;
+}
diff --git a/system/nixos/git.nix b/system/nixos/git.nix
new file mode 100644
index 0000000..dd6a15c
--- /dev/null
+++ b/system/nixos/git.nix
@@ -0,0 +1,3 @@
+{
+  programs.git.enable = true;
+}
diff --git a/system/nixos/ssh.nix b/system/nixos/ssh.nix
new file mode 100644
index 0000000..8f0456f
--- /dev/null
+++ b/system/nixos/ssh.nix
@@ -0,0 +1,3 @@
+{
+  services.openssh.enable = true;
+}