diff --git a/services/lnd/lightning.js b/services/lnd/lightning.js
index 89fea045..caf232f2 100644
--- a/services/lnd/lightning.js
+++ b/services/lnd/lightning.js
@@ -1,7 +1,8 @@
+const Path = require("path");
 const grpc = require("grpc");
 const protoLoader = require("@grpc/proto-loader");
-const fs = require("../../utils/fs");
 const logger = require("winston");
+const fs = require("../../utils/fs");
 const errorConstants = require("../../constants/errors");
 
 // expose the routes to our app with module.exports
@@ -42,7 +43,7 @@ module.exports = async ({
       enums: String,
       defaults: true,
       oneofs: true,
-      includeDirs: ["node_modules/google-proto-files", "proto"]
+      includeDirs: ["node_modules/google-proto-files", "proto", Path.resolve(__dirname, "../../config")]
     }
 
     const [lnrpcProto, routerProto, walletUnlockerProto] = await Promise.all([protoLoader.load(lnrpcProtoPath, protoLoaderConfig), protoLoader.load(routerProtoPath, protoLoaderConfig), protoLoader.load(walletUnlockerProtoPath, protoLoaderConfig)]);
diff --git a/src/server.js b/src/server.js
index d2bbe902..7a0c2a4c 100644
--- a/src/server.js
+++ b/src/server.js
@@ -29,7 +29,7 @@ const server = program => {
 
   // load app default configuration data
   const defaults = require('../config/defaults')(program.mainnet)
-  const rootFolder = process.resourcesPath || __dirname
+  const rootFolder = program.rootPath || process.resourcesPath || __dirname
 
   // define env variables
   Dotenv.config()
@@ -212,12 +212,14 @@ const server = program => {
       })
 
       app.use((req, res, next) => {
-        res.set('Version', program.version())
+        res.set('Version', program.version ? program.version() : 'N/A')
         next()
       })
 
+      const storageDirectory = Path.resolve(rootFolder, `${program.rootPath ? '.' : '..'}/.storage`);
+
       await Storage.init({
-        dir: Path.resolve(rootFolder, '../.storage')
+        dir: storageDirectory
       })
 
       const getSessionSecret = async () => {