diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 9d636a5..c01e666 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -376,6 +376,9 @@ in {
       # are not restarted when the secrets target restarts.
       # The secrets target always restarts when deploying with one of the methods
       # in ./deployment.
+      #
+      # TODO-EXTERNAL: Instead of `wants`, use a future systemd dependency type
+      # that propagates initial start failures but no restarts
       wants = [ "nix-bitcoin-secrets.target" ];
       after = [ "network.target" "nix-bitcoin-secrets.target" ];
       wantedBy = [ "multi-user.target" ];
diff --git a/modules/onion-services.nix b/modules/onion-services.nix
index 7aa3cfa..9483e01 100644
--- a/modules/onion-services.nix
+++ b/modules/onion-services.nix
@@ -80,7 +80,9 @@ in {
       systemd.services = let
         onionAddresses = [ "onion-addresses.service" ];
       in genAttrs publicServices (service: {
-        requires = onionAddresses;
+        # TODO-EXTERNAL: Instead of `wants`, use a future systemd dependency type
+        # that propagates initial start failures but no restarts
+        wants = onionAddresses;
         after = onionAddresses;
       });
     })