diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 0f365979..9905bbd8 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -275,7 +275,6 @@
     sessionVariables = lib.mkMerge [
       {
         LANG = "en_US.UTF-8";
-        DOCKER_BUILDKIT = 1;
       }
       (lib.mkIf (!headless) {
         # TERMINAL = "alacritty -o font.size=12";
diff --git a/system/modules/docker/default.nix b/system/modules/docker/default.nix
index 32e0d3de..e84d2c81 100644
--- a/system/modules/docker/default.nix
+++ b/system/modules/docker/default.nix
@@ -9,6 +9,12 @@ in {
   options.modules.docker = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf docker.enable {
+    environment.variables = lib.mkMerge [
+      (lib.mkIf (!docker.podman) {
+        DOCKER_BUILDKIT = 1;
+      })
+    ];
+
     virtualisation = {
       docker = {
         enable = !docker.podman;