diff --git a/home-manager/features/development/development.nix b/home-manager/features/development/development.nix
index ffdf10b..a77984f 100644
--- a/home-manager/features/development/development.nix
+++ b/home-manager/features/development/development.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     # Dev apps
@@ -12,8 +12,10 @@
     ./lua.nix
   ];
 
-  home.packages = with pkgs; [
-    # Dev helpers
-    direnv
-  ];
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
 }
diff --git a/home-manager/features/development/docker.nix b/home-manager/features/development/docker.nix
new file mode 100644
index 0000000..68e838d
--- /dev/null
+++ b/home-manager/features/development/docker.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  # Use podman over docker
+  services.podman = {
+    enable = true;
+  };
+
+  home.packages = with pkgs; [
+    podman-compose
+  ];
+}
diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix
index 92a70e1..0bcedde 100644
--- a/system/hosts/altair/drew.nix
+++ b/system/hosts/altair/drew.nix
@@ -9,11 +9,12 @@ in
   imports =
     map (x: ../../../home-manager + x) [
       "/features/development/development.nix"
+      "/features/development/docker.nix"
       "/features/development/haskell.nix"
+      "/features/eww"
       "/features/gaming.nix"
       "/features/linux-desktop.nix"
       "/features/notes.nix"
-      "/features/eww"
     ]
     ++ [
       (import ../../../home-manager/features/wallpaper.nix monitors)
diff --git a/system/hosts/vega/drew.nix b/system/hosts/vega/drew.nix
index 47876a6..5b1bd95 100644
--- a/system/hosts/vega/drew.nix
+++ b/system/hosts/vega/drew.nix
@@ -4,6 +4,7 @@
     map (x: ../../../home-manager + x) [
       "/features/development/development.nix"
       "/features/development/haskell.nix"
+      "/features/development/docker.nix"
       "/features/linux-desktop.nix"
       "/features/notes.nix"
       "/features/eww"