diff --git a/install/generator-cyphernode/generators/app/templates/installer/config.sh b/install/generator-cyphernode/generators/app/templates/installer/config.sh
index 399a395..35ed8ee 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/config.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/config.sh
@@ -3,11 +3,17 @@ BITCOIN_INTERNAL=<%= (bitcoin_mode==="internal"?'true':'false') %>
 FEATURE_LIGHTNING=<%= (features.indexOf('lightning') != -1)?'true':'false' %>
 FEATURE_OTSCLIENT=<%= (features.indexOf('otsclient') != -1)?'true':'false' %>
 LIGHTNING_IMPLEMENTATION=<%= lightning_implementation %>
-BITCOIN_DATAPATH=<%= bitcoin_datapath %>
-LIGHTNING_DATAPATH=<%= lightning_datapath %>
-OTSCLIENT_DATAPATH=<%= otsclient_datapath %>
 PROXY_DATAPATH=<%= proxy_datapath %>
 GATEKEEPER_DATAPATH=<%= gatekeeper_datapath %>
 DOCKER_MODE=<%= docker_mode %>
 RUN_AS_USER=<%= run_as_different_user?username:'' %>
 CLEANUP=<%= installer_cleanup?'true':'false' %>
+<% if ( features.indexOf('lightning') !== -1 && lightning_implementation === 'c-lightning' ) { %>
+OTSCLIENT_DATAPATH=<%= otsclient_datapath %>
+<% } %>
+<% if ( features.indexOf('otsclient') !== -1 ) { %>
+LIGHTNING_DATAPATH=<%= lightning_datapath %>
+<% } %>
+<% if ( bitcoin_mode==="internal" ) { %>
+BITCOIN_DATAPATH=<%= bitcoin_datapath %>
+<% } %>
diff --git a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
index d5c0df8..b28cb25 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
+++ b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
@@ -48,8 +48,13 @@ services:
 <% } %>
     volumes:
       - "<%= proxy_datapath %>:/proxy/db"
+  <% if ( features.indexOf('lightning') !== -1 && lightning_implementation === 'c-lightning' ) { %>
       - "<%= lightning_datapath %>:/.lightning"
+  <% } %>
+  <% if ( features.indexOf('otsclient') !== -1 ) { %>
       - "<%= otsclient_datapath %>:/proxy/otsfiles"
+  <% } %>
+
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]