diff --git a/ci/OWNERS b/ci/OWNERS
index 7ba49641ca88..cad846ee537e 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -472,7 +472,7 @@ pkgs/development/interpreters/lfe/      @NixOS/beam
 pkgs/by-name/oc/octodns/ @anthonyroussel
 
 # Teleport
-pkgs/servers/teleport   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
+pkgs/by-name/te/teleport*   @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
 
 # Warp-terminal
 pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @donteatoreo @johnrtitor
diff --git a/pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch b/pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch
similarity index 100%
rename from pkgs/servers/teleport/0001-fix-add-nix-path-to-exec-env.patch
rename to pkgs/by-name/te/teleport/0001-fix-add-nix-path-to-exec-env.patch
diff --git a/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch
similarity index 100%
rename from pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch
rename to pkgs/by-name/te/teleport/disable-wasm-opt-for-ironrdp.patch
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/by-name/te/teleport/package.nix
similarity index 91%
rename from pkgs/servers/teleport/generic.nix
rename to pkgs/by-name/te/teleport/package.nix
index e47a9472f763..4cce72857609 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo123Module,
   rustPlatform,
   fetchFromGitHub,
   fetchpatch,
@@ -15,18 +15,18 @@
   rustc,
   stdenv,
   xdg-utils,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_95,
   wasm-pack,
   nixosTests,
 
   withRdpClient ? true,
 
-  version,
-  hash,
-  vendorHash,
+  version ? "17.4.8",
+  hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=",
+  vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=",
   extPatches ? [ ],
-  cargoHash,
-  pnpmHash,
+  cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=",
+  pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=",
 }:
 let
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
@@ -84,7 +84,7 @@ let
       rustc
       rustc.llvmPackages.lld
       rustPlatform.cargoSetupHook
-      wasm-bindgen-cli
+      wasm-bindgen-cli_0_2_95
       wasm-pack
     ];
 
@@ -120,7 +120,7 @@ let
     '';
   };
 in
-buildGoModule (finalAttrs: {
+buildGo123Module (finalAttrs: {
   inherit pname src version;
   inherit vendorHash;
   proxyVendor = true;
diff --git a/pkgs/servers/teleport/rdpclient.patch b/pkgs/by-name/te/teleport/rdpclient.patch
similarity index 100%
rename from pkgs/servers/teleport/rdpclient.patch
rename to pkgs/by-name/te/teleport/rdpclient.patch
diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/by-name/te/teleport/tsh.patch
similarity index 100%
rename from pkgs/servers/teleport/tsh.patch
rename to pkgs/by-name/te/teleport/tsh.patch
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
new file mode 100644
index 000000000000..9aa3b7962b95
--- /dev/null
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -0,0 +1,10 @@
+{
+  teleport,
+}:
+teleport.override {
+  version = "16.5.9";
+  hash = "sha256-lIWJV3AQ+XWApfjtdUL8ZlHAXCyvwVAGsZjjvXul36I=";
+  vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I=";
+  pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
+  cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I";
+}
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
new file mode 100644
index 000000000000..9e9d580d4c33
--- /dev/null
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -0,0 +1,4 @@
+{
+  teleport,
+}:
+teleport
diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix
deleted file mode 100644
index 4addf38f134f..000000000000
--- a/pkgs/servers/teleport/16/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-args:
-import ../generic.nix (
-  args
-  // {
-    version = "16.5.9";
-    hash = "sha256-lIWJV3AQ+XWApfjtdUL8ZlHAXCyvwVAGsZjjvXul36I=";
-    vendorHash = "sha256-DdVBtMwz0AIGCYj/QLczG8GPP9mqKrdF+M0NqmM6J0I=";
-    pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";
-    cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I";
-  }
-)
diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix
deleted file mode 100644
index 7a27c8d538a0..000000000000
--- a/pkgs/servers/teleport/17/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ wasm-bindgen-cli, ... }@args:
-import ../generic.nix (
-  args
-  // {
-    version = "17.4.8";
-    hash = "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=";
-    vendorHash = "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=";
-    pnpmHash = "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=";
-    cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  }
-)
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
deleted file mode 100644
index 6da79f81936b..000000000000
--- a/pkgs/servers/teleport/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  callPackages,
-  lib,
-  wasm-bindgen-cli_0_2_95,
-  buildGo123Module,
-  ...
-}@args:
-let
-  f = args: rec {
-    teleport_16 = import ./16 (
-      args
-      // {
-        wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-        buildGoModule = buildGo123Module;
-      }
-    );
-    teleport_17 = import ./17 (
-      args
-      // {
-        wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
-        buildGoModule = buildGo123Module;
-      }
-    );
-    teleport = teleport_17;
-  };
-  # Ensure the following callPackages invocation includes everything 'generic' needs.
-  f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));
-in
-callPackages f' (
-  builtins.removeAttrs args [
-    "callPackages"
-    "wasm-bindgen-cli_0_2_95"
-    "buildGo123Module"
-  ]
-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43c0e54c3637..29854dcc2eb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4532,14 +4532,6 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
-  inherit
-    (callPackages ../servers/teleport {
-    })
-    teleport_16
-    teleport_17
-    teleport
-    ;
-
   telepresence = callPackage ../tools/networking/telepresence {
     pythonPackages = python3Packages;
   };