diff --git a/system/modules/docker/default.nix b/system/modules/docker/default.nix
index 9fde287f..61c5e4a9 100644
--- a/system/modules/docker/default.nix
+++ b/system/modules/docker/default.nix
@@ -10,7 +10,7 @@ in {
 
   config = lib.mkIf docker.enable {
     environment.variables = lib.mkMerge [
-      (lib.mkIf (!docker.podman) {
+      (lib.mkIf ((!docker.podman) && docker.buildkit) {
         DOCKER_BUILDKIT = 1;
       })
     ];
diff --git a/system/modules/docker/options.nix b/system/modules/docker/options.nix
index 696c8946..63d22683 100644
--- a/system/modules/docker/options.nix
+++ b/system/modules/docker/options.nix
@@ -7,6 +7,7 @@
 
   podman = lib.mkEnableOption "Use podman instead of docker";
   docker.rootless = lib.mkEnableOption "Use rootless docker (no effect if podman is used)";
+  docker.buildkit = lib.mkEnableOption "Use Docker BuildKit (no effect if podman is used)";
 
   networks = lib.mkOption {
     type = lib.types.listOf (lib.types.submodule ({