diff --git a/docs/src/security/threat-model/README.md b/docs/src/security/threat-model/README.md
index 251e9c87c..640f28d76 100644
--- a/docs/src/security/threat-model/README.md
+++ b/docs/src/security/threat-model/README.md
@@ -85,28 +85,67 @@ SPDX-License-Identifier: MIT
   and then those secrets can be published to a binary cache
   that is publicly accessible.
 
+  Examples of this include Nix idioms like:
+
+  ```nix
+  [
+    // Nix would load the secrets in plain-text to the `/nix/store`
+    ./file-with-secrets-in-plain-text.txt
+
+    // Nix would load the git repository to the `/nix/store`
+    // This also applies to other builtins.fetch* that could
+    // fetch private information
+    (builtins.fetchGit {
+      // Private repository (with potential intellectual property)
+      url = "git@github.com:company/secrets.git";
+    })
+  ]
+  ```
+
   Mitigation:
 
+  - Nothing from the `/nix/store`
+    is pushed to a binary cache by default.
+    A user would need to configure the cache explicitly,
+    and expose the corresponding secret
+    in an environment variable.
+  - Makes has support for binary caches
+    that require a secret for reading and writting,
+    so a user may chose to use this instead
+    as an extra layer of prevention
+    if loading secrets to the `/nix/store` is mandatory.
+    Please see <https://cachix.org/> for more information.
   - Makes has utilities for working with secrets in a way
     that they are only copied to the `/nix/store`
     in encrypted form,
     and then decrypted at runtime,
     where there are safe from disclosure.
+
+    For example:
+    `secretsForAwsFromEnv`,
+    `secretsForAwsFromGitlab`,
+    `secretsForEnvFromSops`,
+    `secretsForGpgFromEnv`,
+    `secretsForKubernetesConfigFromAws`, and
+    `secretsForTerraformFromEnv`.
+
+    However, we don't currently have a way to protect the user
+    from using `builtins.fetch*`.
+    If your workflow needs this,
+    please avoid pushing artifacts to a public binary cache,
+    or use a private binary cache instead.
+
   - Makes copies the contents of the git repository
     into a trusted control plane,
     and excludes all of the files
     that are not tracked by Git
     from this checkout.
-  - Nothing from the `/nix/store`
-    is pushed to a binary cache by default.
-    A user would need to configure the cache explicitly,
-    and expose the corresponding secret
-    in an environment variable.
-  - Makes has support for binary caches
-    that are not publicly accessible as well,
-    so a user may chose to use this instead
-    as an extra layer of prevention.
-    Please see <https://cachix.org/> for more information.
+    This means that if the file with secrets is inside the repository,
+    but included in the `.gitignore`
+    such that a `git fetch` of the given remote and revision
+    would ignore it,
+    Makes would not copy it into the trusted control plane,
+    and therefore Nix wouldn't load it into the `/nix/store`.
 
 ## Denial of Service
 
diff --git a/makes/cli/env/runtime/main.nix b/makes/cli/env/runtime/main.nix
index ea08b3efd..ff47cc78b 100644
--- a/makes/cli/env/runtime/main.nix
+++ b/makes/cli/env/runtime/main.nix
@@ -14,6 +14,7 @@ makeSearchPaths {
     __nixpkgs__.gnutar
     __nixpkgs__.gzip
     __nixpkgs__.nixStable
+    __nixpkgs__.openssh
   ];
   source = [
     outputs."/cli/env/runtime/pypi"
diff --git a/src/cli/main/cli.py b/src/cli/main/cli.py
index 74e1461e2..7e336b797 100644
--- a/src/cli/main/cli.py
+++ b/src/cli/main/cli.py
@@ -108,9 +108,6 @@
     CON.out("Using feature flag: MAKES_NIX_UNSTABLE")
 
 
-# Constants
-
-
 def _if(condition: Any, *value: Any) -> List[Any]:
     return list(value) if condition else []