diff --git a/.gitmodules b/.gitmodules
index 1dd60af11..3e0f670ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
 [submodule "fhevm-tfhe-cli"]
 	path = fhevm-tfhe-cli
 	url = https://github.com/zama-ai/fhevm-tfhe-cli
+[submodule "git-lfs"]
+	path = git-lfs
+	url = https://github.com/RizeLabs/git-lfs.git
diff --git a/build_geth_fhevm.sh b/build_geth_fhevm.sh
index 6e687c38a..2a3e9ea83 100755
--- a/build_geth_fhevm.sh
+++ b/build_geth_fhevm.sh
@@ -71,9 +71,8 @@ build_fhevm() {
     log INFO "Building FHEVM components..."
 
     git submodule update --init --recursive fhevm-go
-    git submodule add https://github.com/RizeLabs/git-lfs.git tfhe-keys
-    export FHEVM_GO_KEYS_DIR=$(pwd)/tfhe-keys
-    log INFO "TFHE keys available in $FHEVM_GO_KEYS_DIR"
+    git submodule update --init --recursive git-lfs
+    export FHEVM_GO_KEYS_DIR=$(pwd)/git-lfs/tfhe-keys
 
     log DEBUG "Entering fhevm-go directory..."
     cd fhevm-go || { log ERROR "fhevm-go directory not found"; exit 1; }