diff --git a/rootfs/standard/etc/tor/torrc b/rootfs/standard/etc/tor/torrc
index 8d9bd6bd..b4f59c98 100644
--- a/rootfs/standard/etc/tor/torrc
+++ b/rootfs/standard/etc/tor/torrc
@@ -295,4 +295,4 @@ HiddenServicePort 53001 127.0.0.1:53001
 
 
 # Include tor settings for other apps
-%include /etc/torrc.d/
\ No newline at end of file
+%include /etc/torrc.d
\ No newline at end of file
diff --git a/rootfs/standard/var/pynode/application_info.py b/rootfs/standard/var/pynode/application_info.py
index 776b43f1..3a443441 100644
--- a/rootfs/standard/var/pynode/application_info.py
+++ b/rootfs/standard/var/pynode/application_info.py
@@ -501,16 +501,16 @@ def create_application_tor_service(app_data):
     run_linux_cmd("mkdir -p /etc/torrc.d")
     torrc_file = "/etc/torrc.d/"+app_data["short_name"]
     with open(torrc_file, "w") as f:
-        f.write("# Hidden Service for {}".format(app_data["short_name"]))
-        f.write("HiddenServiceDir /var/lib/tor/{}/".format(app_data["short_name"]))
-        f.write("HiddenServiceVersion 3")
+        f.write("# Hidden Service for {}\n".format(app_data["short_name"]))
+        f.write("HiddenServiceDir /var/lib/tor/mynode_{}/\n".format(app_data["short_name"]))
+        f.write("HiddenServiceVersion 3\n")
         if "http_port" in app_data and app_data["http_port"] != None:
-            f.write("HiddenServicePort 80 127.0.0.1:{}".format(app_data["http_port"]))
+            f.write("HiddenServicePort 80 127.0.0.1:{}\n".format(app_data["http_port"]))
         if "http_port" in app_data and app_data["http_port"] != None:
-            f.write("HiddenServicePort 443 127.0.0.1:{}".format(app_data["https_port"]))
+            f.write("HiddenServicePort 443 127.0.0.1:{}\n".format(app_data["https_port"]))
         if "extra_ports" in app_data and app_data["extra_ports"] != None:
             for p in app_data["extra_ports"]:
-                f.write("HiddenServicePort {} 127.0.0.1:{}".format(p, p))
+                f.write("HiddenServicePort {} 127.0.0.1:{}\n".format(p, p))
 
 def install_application_tarball(app_data):
     log_message("  Running install_application_tarball...")