diff --git a/pkgs/tools/misc/steampipe-packages/default.nix b/pkgs/tools/misc/steampipe-packages/default.nix
new file mode 100644
index 0000000000000..4e20b6abbcae5
--- /dev/null
+++ b/pkgs/tools/misc/steampipe-packages/default.nix
@@ -0,0 +1,6 @@
+{ callPackage }:
+
+{
+  steampipe-plugin-aws = callPackage ./steampipe-plugin-aws { };
+  steampipe-plugin-github = callPackage ./steampipe-plugin-github { };
+}
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
new file mode 100644
index 0000000000000..7e3952665e219
--- /dev/null
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -0,0 +1,51 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  steampipe,
+}:
+
+buildGoModule rec {
+  pname = "steampipe-plugin-aws";
+  version = "0.138.0";
+
+  src = fetchFromGitHub {
+    owner = "turbot";
+    repo = "steampipe-plugin-aws";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2iJCCntjv9S+mJtszGY0RbHYQr59umTry/L4vDv9nLs=";
+  };
+
+  vendorHash = "sha256-Nz5eq64YV82foMH9l5o/lDlVcbsWwS2ftRTIdA5+EnA=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp $GOPATH/bin/steampipe-plugin-aws $out/steampipe-plugin-aws.plugin
+    cp -R docs $out/.
+    cp -R config $out/.
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/turbot/steampipe-plugin-aws/blob/v${version}/CHANGELOG.md";
+    description = "AWS Plugin for Steampipe";
+    homepage = "https://github.com/turbot/steampipe-plugin-aws";
+    license = lib.licenses.apsl20;
+    longDescription = "Use SQL to instantly query AWS resources across regions and accounts.";
+    maintainers = with lib.maintainers; [ anthonyroussel ];
+    platforms = steampipe.meta.platforms;
+  };
+}
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
new file mode 100644
index 0000000000000..f1b829d5b3b24
--- /dev/null
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -0,0 +1,51 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  steampipe,
+}:
+
+buildGoModule rec {
+  pname = "steampipe-plugin-github";
+  version = "0.41.0";
+
+  src = fetchFromGitHub {
+    owner = "turbot";
+    repo = "steampipe-plugin-github";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HrtAeQrJJhM1FroeIAVp9ItCFJR/7KkZQLs5QHDVtxw=";
+  };
+
+  vendorHash = "sha256-GVd0Mif1gsANCBz/0db0Pvcgf3XW1CsZTKgiZ4pWaaI=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp $GOPATH/bin/steampipe-plugin-github $out/steampipe-plugin-github.plugin
+    cp -R docs $out/.
+    cp -R config $out/.
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/turbot/steampipe-plugin-github/blob/v${version}/CHANGELOG.md";
+    description = "GitHub Plugin for Steampipe";
+    homepage = "https://github.com/turbot/steampipe-plugin-github";
+    license = lib.licenses.apsl20;
+    longDescription = "Use SQL to instantly query repositories, users, gists and more from GitHub.";
+    maintainers = with lib.maintainers; [ anthonyroussel ];
+    platforms = steampipe.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6902cfd6297f7..f0298d884e87a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6192,6 +6192,10 @@ with pkgs;
 
   statserial = callPackage ../tools/misc/statserial { };
 
+  steampipePackages = recurseIntoAttrs (
+    callPackage ../tools/misc/steampipe-packages { }
+  );
+
   step-ca = callPackage ../tools/security/step-ca {
     inherit (darwin.apple_sdk.frameworks) PCSC;
   };