diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix
index 34f02c6..e7e12a0 100644
--- a/src/system/modules/bitcoin/default.nix
+++ b/src/system/modules/bitcoin/default.nix
@@ -41,13 +41,14 @@ in
         "bitcoin" = {
           members = [
             "btc"
+            config.user.name
           ];
         };
       };
     };
 
     programs.bash.shellAliases = {
-      btc = "bitcoind";
+      btc = "bitcoin-cli";
     };
 
     services.bitcoind = {
diff --git a/src/system/modules/bitcoin/modules/clightning/default.nix b/src/system/modules/bitcoin/modules/clightning/default.nix
index b5d57a5..5d8d670 100644
--- a/src/system/modules/bitcoin/modules/clightning/default.nix
+++ b/src/system/modules/bitcoin/modules/clightning/default.nix
@@ -47,6 +47,11 @@ in
       cln = "lightning-cli";
     };
 
+    # Symlink for CLI access - allows `lightning-cli` without --lightning-dir
+    systemd.tmpfiles.rules = mkAfter [
+      "L+ /home/${config.user.name}/.lightning - - - - ${home}"
+    ];
+
     systemd.services.lightningd = {
       description = "Core Lightning Daemon";
       wantedBy = [ "multi-user.target" ];
@@ -59,7 +64,7 @@ in
       ];
 
       serviceConfig = {
-        ExecStartPre = "+${pkgs.coreutils}/bin/chmod 750 /var/lib/bitcoin /var/lib/tor";
+        ExecStartPre = "+${pkgs.coreutils}/bin/chmod 750 /var/lib/bitcoin /var/lib/tor ${home} ${home}/bitcoin";
         ExecStart = "${pkgs.clightning}/bin/lightningd --conf=${clnConfig}";
         User = "clightning";
         Group = "bitcoin";