diff --git a/dist/config.json.sample b/dist/config.json.sample
index 28446e6..c0abc27 100644
--- a/dist/config.json.sample
+++ b/dist/config.json.sample
@@ -14,7 +14,6 @@
   "bitcoin_prune": false,
   "bitcoin_uacomment": "",
   "lightning_implementation": "c-lightning",
-  "lightning_external_ip": "clightning.nodes.com",
   "lightning_nodename": "SatoshiPortal",
   "lightning_nodecolor": "ff00ff",
   "electrum_implementation": "eps",
@@ -24,4 +23,4 @@
   "lightning_datapath": "/tmp/l",
   "bitcoin_expose": false,
   "devmode": true
-}
\ No newline at end of file
+}
diff --git a/install/generator-cyphernode/generators/app/help.json b/install/generator-cyphernode/generators/app/help.json
index dcb3378..9a5bd05 100644
--- a/install/generator-cyphernode/generators/app/help.json
+++ b/install/generator-cyphernode/generators/app/help.json
@@ -28,7 +28,6 @@
   "bitcoin_datapath_custom": " ",
   "bitcoin_expose": "By default, Bitcoin node ports (RPC and protocol) won't be <font underline='true'>published</font> outside of Docker. Do you want to expose them so that your node can be accessed from outside of the Docker network?",
   "lightning_implementation": "Multiple <font underline='true'>LN implementations</font> exist. Please choose the one you want to use with Cyphernode.",
-  "lightning_external_ip": "If you want you LN node to be accessible from the Internet, provide the <font underline='true'>IP address</font> that other LN nodes will use to connect to it. This is usually your router's public IP. <font color='#00ff00'>NOTE</font>: In case you are running Cyphernode at home. This option won't make your router forward needed LN ports; you still need to configure and manage that part yourself in your router configuration.",
   "lightning_nodename": "LN nodes have names. Choose the <font underline='true'>name you want</font> for yours.",
   "lightning_nodecolor": "LN nodes have colors. Choose the <font underline='true'>color you want</font> for yours in RGB format (RRGGBB). For example, pure red would be <font color='#ff0000'>ff0000</font>.",
   "lightning_datapath": "<font underline='true'>Path name</font> to where LN's data files are stored. This directory will be mounted into the LN node's container.",
diff --git a/install/generator-cyphernode/generators/app/prompters/200_lightning.js b/install/generator-cyphernode/generators/app/prompters/200_lightning.js
index afc0ef3..5da99a9 100644
--- a/install/generator-cyphernode/generators/app/prompters/200_lightning.js
+++ b/install/generator-cyphernode/generators/app/prompters/200_lightning.js
@@ -46,15 +46,6 @@ module.exports = {
       ]
     },
     */
-    {
-      when: featureCondition,
-      type: 'input',
-      name: 'lightning_external_ip',
-      default: utils._getDefault( 'lightning_external_ip' ),
-      filter: utils._trimFilter,
-      validate: utils._ipOrFQDNValidator,
-      message: prefix()+'What external ip does your lightning node have?'+utils._getHelp('lightning_external_ip'),
-    },
     {
       when: featureCondition,
       type: 'input',
@@ -87,4 +78,4 @@ module.exports = {
   templates: function( props ) {
     return templates[props.lightning_implementation]
   }
-};
\ No newline at end of file
+};
diff --git a/install/generator-cyphernode/generators/app/templates/installer/start.sh b/install/generator-cyphernode/generators/app/templates/installer/start.sh
index f49cd52..df94744 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/start.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/start.sh
@@ -32,16 +32,16 @@ echo "EXIT_STATUS=1" > $current_path/exitStatus.sh
 
 # Will test if Cyphernode is fully up and running...
 docker run --rm -it -v $current_path/testfeatures.sh:/testfeatures.sh \
--v ~/.cyphernode/gatekeeper:/gatekeeper \
+-v <%= gatekeeper_datapath %>:/gatekeeper \
 -v $current_path/exitStatus.sh:/exitStatus.sh \
 --network cyphernodenet alpine:3.8 /testfeatures.sh
 
-if [[ -f $current_path/exitStatus.sh ]]; then
+if [ -f $current_path/exitStatus.sh ]; then
   . $current_path/exitStatus.sh
   rm $current_path/exitStatus.sh
 fi
 
-if [[ ! $EXIT_STATUS == 0 ]]; then
+if [ "$EXIT_STATUS" -ne "0" ]; then
   exec ./stop.sh
   exit 1
 fi