diff --git a/.gitmodules b/.gitmodules
index d967bb31..f239b29d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,7 @@
 [submodule "reference-code/rebalance-lnd"]
 	path = reference-code/rebalance-lnd
 	url = https://github.com/C-Otto/rebalance-lnd
+[submodule "remote-signer"]
+	path = remote-signer
+	url = https://github.com/Elenpay/Nodeguard-Remote-Signer
+	branch = develop
diff --git a/.justfile b/.justfile
index 8815ce54..32adb301 100644
--- a/.justfile
+++ b/.justfile
@@ -92,6 +92,22 @@ mine:
 update-protos:
     ./src/Proto/update-protos.sh
 
+##############
+# Submodules #
+##############
+
+REMOTE_SIGNER_URL := 'https://github.com/Elenpay/Nodeguard-Remote-Signer'
+REMOTE_SIGNER_DIR := 'remote-signer'
+
+# Add the Remote Signer submodule, or initialize it on a fresh clone
+add-remote-signer:
+    git submodule add -b develop {{REMOTE_SIGNER_URL}} {{REMOTE_SIGNER_DIR}} 2>/dev/null || git submodule update --init {{REMOTE_SIGNER_DIR}}
+
+# Sync the Remote Signer submodule config and update it to the latest remote develop commit
+sync-remote-signer:
+    git submodule sync {{REMOTE_SIGNER_DIR}}
+    git submodule update --init --remote {{REMOTE_SIGNER_DIR}}
+
 ##########
 # Docker #
 ##########
diff --git a/remote-signer b/remote-signer
new file mode 160000
index 00000000..3e840efd
--- /dev/null
+++ b/remote-signer
@@ -0,0 +1 @@
+Subproject commit 3e840efd4c911744d8a9ac4a8c930fd5e31436b2