diff --git a/pkgs/ai/llm.nix b/pkgs/ai/llm.nix
index 8a2d27e34..351784087 100644
--- a/pkgs/ai/llm.nix
+++ b/pkgs/ai/llm.nix
@@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec {
     description = "Run inference for Large Language Models on CPU, with Rust";
     homepage = "https://github.com/rustformers/llm";
     license = licenses.mit;
+    mainProgram = "llm";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/bonk.nix b/pkgs/cli/bonk.nix
index 42606b0ea..cf456f9ac 100644
--- a/pkgs/cli/bonk.nix
+++ b/pkgs/cli/bonk.nix
@@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "The blazingly fast touch alternative with a sprinkle of mkdir written in rust";
     homepage = "https://github.com/elliot40404/bonk";
     license = licenses.mit;
+    mainProgram = "bonk";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/comcast.nix b/pkgs/cli/comcast.nix
index 834ac1ce9..183454124 100644
--- a/pkgs/cli/comcast.nix
+++ b/pkgs/cli/comcast.nix
@@ -20,6 +20,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "Simulating shitty network connections so you can build better systems";
     license = licenses.asl20;
+    mainProgram = "comcast";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/dirdiff.nix b/pkgs/cli/dirdiff.nix
index ab5132ba8..a91fe9f5e 100644
--- a/pkgs/cli/dirdiff.nix
+++ b/pkgs/cli/dirdiff.nix
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Efficiently compute the differences between two directories";
     homepage = "https://github.com/ocamlpro/dirdiff";
     license = licenses.mit;
+    mainProgram = "dirdiff";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/hunt.nix b/pkgs/cli/hunt.nix
index b7f09a5df..a9fb3c8f2 100644
--- a/pkgs/cli/hunt.nix
+++ b/pkgs/cli/hunt.nix
@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "simplified find command made with rust";
     license = licenses.mit;
+    mainProgram = "hunt";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/lastresort.nix b/pkgs/cli/lastresort.nix
index 34dcbc116..fb3b44a66 100644
--- a/pkgs/cli/lastresort.nix
+++ b/pkgs/cli/lastresort.nix
@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Encode and decode data in base 256 easily typed words";
     license = licenses.isc;
+    mainProgram = "lastresort";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/ov.nix b/pkgs/cli/ov.nix
index dae160c18..d72645956 100644
--- a/pkgs/cli/ov.nix
+++ b/pkgs/cli/ov.nix
@@ -31,6 +31,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "Feature-rich terminal-based text viewer";
     license = licenses.mit;
+    mainProgram = "ov";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/rare.nix b/pkgs/cli/rare.nix
index 85cd73a72..cbb2ef22a 100644
--- a/pkgs/cli/rare.nix
+++ b/pkgs/cli/rare.nix
@@ -17,6 +17,7 @@ buildGo120Module rec {
     description =
       "Realtime regex-extraction and aggregation into common formats such as histograms, bar graphs, numerical summaries, tables, and more";
     license = licenses.gpl3Only;
+    mainProgram = "rare";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cli/tlsh-go.nix b/pkgs/cli/tlsh-go.nix
index adaefd234..441633b7b 100644
--- a/pkgs/cli/tlsh-go.nix
+++ b/pkgs/cli/tlsh-go.nix
@@ -31,6 +31,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "TLSH lib in Golang";
     license = licenses.asl20;
+    mainProgram = "tlsh";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cloud/README.md b/pkgs/cloud/README.md
index 471a8c945..9dd5e944a 100644
--- a/pkgs/cloud/README.md
+++ b/pkgs/cloud/README.md
@@ -16,6 +16,8 @@ This directory contains tooling related to various cloud providers
 
 ### [gofakes3.nix](./gofakes3.nix)
 
+### [headscale-ui.nix](./headscale-ui.nix)
+
 ### [s3-edit.nix](./s3-edit.nix)
 
 ### [terraform-cloud-exporter.nix](./terraform-cloud-exporter.nix)
diff --git a/pkgs/cloud/coscli.nix b/pkgs/cloud/coscli.nix
index 0aaaaa62c..52f8dc500 100644
--- a/pkgs/cloud/coscli.nix
+++ b/pkgs/cloud/coscli.nix
@@ -23,6 +23,7 @@ buildGo120Module rec {
     description = "";
     homepage = "https://github.com/tencentyun/coscli";
     license = licenses.asl20;
+    mainProgram = "coscli";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/cloud/gke-gcloud-auth-plugin.nix b/pkgs/cloud/gke-gcloud-auth-plugin.nix
index 84c5731d5..b893ccf27 100644
--- a/pkgs/cloud/gke-gcloud-auth-plugin.nix
+++ b/pkgs/cloud/gke-gcloud-auth-plugin.nix
@@ -48,4 +48,5 @@ stdenvNoCC.mkDerivation rec {
     mkdir -p $out/bin
     mv ./bin/gke-gcloud-auth-plugin $out/bin/gke-gcloud-auth-plugin
   '';
+  meta = { };
 }
diff --git a/pkgs/cloud/s3-edit.nix b/pkgs/cloud/s3-edit.nix
index 1cab4196d..22c644634 100644
--- a/pkgs/cloud/s3-edit.nix
+++ b/pkgs/cloud/s3-edit.nix
@@ -22,6 +22,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "Edit directly a file on Amazon S3 in CLI";
     license = licenses.mit;
+    mainProgram = "s3-edit";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/k8s/README.md b/pkgs/k8s/README.md
index 4a53f410b..0f4cde2e4 100644
--- a/pkgs/k8s/README.md
+++ b/pkgs/k8s/README.md
@@ -6,6 +6,8 @@ This directory contains tools related to kubernetes
 
 ## In this directory
 
+### [katafygio.nix](./katafygio.nix)
+
 ### [kubeshark.nix](./kubeshark.nix)
 
 ### [murre.nix](./murre.nix)
diff --git a/pkgs/k8s/katafygio.nix b/pkgs/k8s/katafygio.nix
index 8b5d84bff..f28066644 100644
--- a/pkgs/k8s/katafygio.nix
+++ b/pkgs/k8s/katafygio.nix
@@ -22,6 +22,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "Dump, or continuously backup Kubernetes objects as yaml files in git";
     license = licenses.mit;
+    mainProgram = "katafygio";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/k8s/kubeshark.nix b/pkgs/k8s/kubeshark.nix
index 0e98367e2..ba16e38ed 100644
--- a/pkgs/k8s/kubeshark.nix
+++ b/pkgs/k8s/kubeshark.nix
@@ -57,5 +57,6 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     license = licenses.mit;
+    mainProgram = "kubeshark";
   };
 }
diff --git a/pkgs/k8s/murre.nix b/pkgs/k8s/murre.nix
index ba6c1aa81..cc935422d 100644
--- a/pkgs/k8s/murre.nix
+++ b/pkgs/k8s/murre.nix
@@ -21,6 +21,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "on-demand, scaleable source of container resource metrics for K8s";
     license = licenses.asl20;
+    mainProgram = "murre";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/misc/horcrux.nix b/pkgs/misc/horcrux.nix
index 047f3c7c4..4f6aaa397 100644
--- a/pkgs/misc/horcrux.nix
+++ b/pkgs/misc/horcrux.nix
@@ -16,6 +16,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "Split your file into encrypted fragments so that you don't need to remember a passcode";
     license = licenses.mit;
+    mainProgram = "horcrux";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/misc/soulmsg.nix b/pkgs/misc/soulmsg.nix
index b6beada36..23b2ad577 100644
--- a/pkgs/misc/soulmsg.nix
+++ b/pkgs/misc/soulmsg.nix
@@ -21,6 +21,7 @@ buildGo120Module rec {
     description = "";
     homepage = "https://github.com/derricw/soulmsg";
     license = licenses.mit;
+    mainProgram = "soulmsg";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }
diff --git a/pkgs/server/poglets.nix b/pkgs/server/poglets.nix
index d1c2af65f..3fece2c5f 100644
--- a/pkgs/server/poglets.nix
+++ b/pkgs/server/poglets.nix
@@ -33,6 +33,7 @@ buildGo120Module rec {
     inherit (src.meta) homepage;
     description = "";
     license = licenses.mit;
+    mainProgram = "poglets";
     maintainers = with maintainers; [ jpetrucciani ];
   };
 }