diff --git a/packages/by-name/microsoft/kata-agent/package.nix b/packages/by-name/microsoft/kata-agent/package.nix
index 8e553642dd..d1141ab384 100644
--- a/packages/by-name/microsoft/kata-agent/package.nix
+++ b/packages/by-name/microsoft/kata-agent/package.nix
@@ -4,7 +4,7 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitHub,
+  microsoft,
   cmake,
   pkg-config,
   protobuf,
@@ -18,14 +18,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kata-agent";
-  version = "3.2.0.azl1";
-
-  src = fetchFromGitHub {
-    owner = "microsoft";
-    repo = "kata-containers";
-    rev = version;
-    hash = "sha256-W36RJFf0MVRIBV4ahpv6pqdAwgRYrlqmu4Y/8qiILS8=";
-  };
+  inherit (microsoft.kata-runtime) version src;
 
   sourceRoot = "${src.name}/src/agent";
 
diff --git a/packages/by-name/microsoft/kata-image/package.nix b/packages/by-name/microsoft/kata-image/package.nix
index f70f1ee994..7a2957a9ba 100644
--- a/packages/by-name/microsoft/kata-image/package.nix
+++ b/packages/by-name/microsoft/kata-image/package.nix
@@ -9,7 +9,6 @@
   microsoft,
   bubblewrap,
   fakeroot,
-  fetchFromGitHub,
   fetchurl,
   yq-go,
   tdnf,
@@ -26,13 +25,6 @@
 }:
 
 let
-  kata-version = "3.2.0.azl1";
-  src = fetchFromGitHub {
-    owner = "microsoft";
-    repo = "kata-containers";
-    rev = kata-version;
-    hash = "sha256-W36RJFf0MVRIBV4ahpv6pqdAwgRYrlqmu4Y/8qiILS8=";
-  };
   # toplevelNixDeps are packages that get installed to the rootfs of the image
   # they are used to determine the (nix) closure of the rootfs
   toplevelNixDeps = [ microsoft.kata-agent ];
@@ -42,9 +34,8 @@ let
     )
   );
   rootfsExtraTree = stdenvNoCC.mkDerivation {
-    inherit src;
     pname = "rootfs-extra-tree";
-    version = kata-version;
+    inherit (microsoft.genpolicy) src version;
 
     # https://github.com/microsoft/azurelinux/blob/59ce246f224f282b3e199d9a2dacaa8011b75a06/SPECS/kata-containers-cc/mariner-coco-build-uvm.sh#L34-L41
     buildPhase = ''
@@ -123,9 +114,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  inherit src;
   pname = "kata-image";
-  version = kata-version;
+  inherit (microsoft.genpolicy) src version;
 
   outputs = [
     "out"
diff --git a/packages/by-name/microsoft/tardev-snapshotter/package.nix b/packages/by-name/microsoft/tardev-snapshotter/package.nix
new file mode 100644
index 0000000000..8ff6e3920c
--- /dev/null
+++ b/packages/by-name/microsoft/tardev-snapshotter/package.nix
@@ -0,0 +1,31 @@
+# Copyright 2024 Edgeless Systems GmbH
+# SPDX-License-Identifier: AGPL-3.0-only
+
+{
+  lib,
+  rustPlatform,
+  microsoft,
+  cmake,
+  protobuf,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tardev-snapshotter";
+  inherit (microsoft.kata-runtime) version src;
+
+  sourceRoot = "${src.name}/src/tardev-snapshotter";
+
+  cargoHash = "sha256-0Jj0+Dsm2wykNopy1Oga0wSQEGIl66AppwmWfjm14mg=";
+
+  nativeBuildInputs = [
+    cmake
+    protobuf
+  ];
+
+  env.RUSTC_BOOTSTRAP = 1;
+
+  meta = {
+    license = lib.licenses.asl20;
+    mainProgram = "tardev-snapshotter";
+  };
+}