diff --git a/lib/cli/flocore.js b/lib/cli/flocore.js
index c798447c..37e47e49 100644
--- a/lib/cli/flocore.js
+++ b/lib/cli/flocore.js
@@ -31,6 +31,13 @@ function main(parentServicesPath, additionalServices) {
       node.cli.main(parentServicesPath, additionalServices);
     }
 
+    // Gracefully Shut Down
+    process.on('SIGTERM', function () {
+      node.stop(function() {
+        process.exit(0)
+      })
+    })
+
   });
 
 }