diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d60ea09..5d69389 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,6 +53,8 @@ jobs:
           .#cyanprint
           .#atomiutils
           .#gardenio
+          .#infrautils
+          .#infralint
           -c bash -c '
           sg --version && 
           upstash --version && 
diff --git a/binWrapper/infralint.nix b/binWrapper/infralint.nix
new file mode 100644
index 0000000..f63f492
--- /dev/null
+++ b/binWrapper/infralint.nix
@@ -0,0 +1,14 @@
+{ nixpkgs }:
+let pkgs = nixpkgs; in
+
+pkgs.runCommand "infralint"
+{
+  buildInputs = [
+    pkgs.hadolint
+    pkgs.helm-docs
+  ];
+} ''
+  mkdir -p $out/bin
+  cp ${pkgs.hadolint}/bin/* $out/bin/
+  cp ${pkgs.helm-docs}/bin/* $out/bin/
+''
diff --git a/binWrapper/infrautils.nix b/binWrapper/infrautils.nix
new file mode 100644
index 0000000..0ac060d
--- /dev/null
+++ b/binWrapper/infrautils.nix
@@ -0,0 +1,26 @@
+{ nixpkgs, gardenio, mirrord }:
+let pkgs = nixpkgs; in
+
+pkgs.runCommand "infrautils"
+{
+  buildInputs = [
+    pkgs.kubernetes-helm
+    pkgs.kubectl
+    pkgs.k3d
+
+    pkgs.docker
+    pkgs.tilt
+
+    gardenio
+    mirrord
+  ];
+} ''
+  mkdir -p $out/bin
+  cp ${pkgs.kubernetes-helm}/bin/* $out/bin/
+  cp ${pkgs.kubectl}/bin/* $out/bin/
+  cp ${pkgs.k3d}/bin/* $out/bin/
+  cp ${pkgs.docker}/bin/* $out/bin/
+  cp ${pkgs.tilt}/bin/* $out/bin/
+  cp ${gardenio}/bin/* $out/bin/
+  cp ${mirrord}/bin/* $out/bin/
+''
diff --git a/default.nix b/default.nix
index b74626d..57b9f3e 100644
--- a/default.nix
+++ b/default.nix
@@ -19,10 +19,13 @@ let
   dotnet = import ./nuget/default.nix { inherit nixpkgs; };
 
   # bin wrapper
-  bin = {
+  bin = rec {
     mirrord = import ./binWrapper/mirrord.nix { inherit nixpkgs; };
     atomiutils = import ./binWrapper/atomiutils.nix { inherit nixpkgs; };
+    infrautils = import ./binWrapper/infrautils.nix { inherit nixpkgs gardenio mirrord; };
+    infralint = import ./binWrapper/infralint.nix { inherit nixpkgs; };
     gardenio = import ./binWrapper/gardenio.nix { inherit nixpkgs; };
+
   };
 
   rust = import ./rust/default.nix { inherit nixpkgs fenix; };