diff --git a/service/ziti-tunnel/config/config.go b/service/ziti-tunnel/config/config.go
index f9da244c..d5f54fc4 100644
--- a/service/ziti-tunnel/config/config.go
+++ b/service/ziti-tunnel/config/config.go
@@ -47,3 +47,18 @@ func LogsPath() string {
 func BackupFile() string {
 	return File() + ".backup"
 }
+func EnsureConfigFolder() error {
+	return ensureFolder(Path())
+}
+func EnsureLogsFolder() error {
+	return ensureFolder(LogsPath())
+}
+func ensureFolder(path string) error {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		mkdirerr := os.Mkdir(path, 0644)
+		if mkdirerr != nil {
+			return mkdirerr
+		}
+	}
+	return nil
+}
diff --git a/service/ziti-tunnel/service/service.go b/service/ziti-tunnel/service/service.go
index e38372ef..fbf72ca4 100644
--- a/service/ziti-tunnel/service/service.go
+++ b/service/ziti-tunnel/service/service.go
@@ -21,6 +21,7 @@ package service
 
 import (
 	"fmt"
+	"github.com/openziti/desktop-edge-win/service/ziti-tunnel/config"
 	"github.com/openziti/desktop-edge-win/service/ziti-tunnel/util/logging"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc/debug"
@@ -30,7 +31,14 @@ type zitiService struct{}
 
 func (m *zitiService) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
 	changes <- svc.Status{State: svc.StartPending}
-
+	err := config.EnsureConfigFolder()
+	if err != nil {
+		log.Panic("config folder not found and was not created by process!")
+	}
+	err = config.EnsureLogsFolder()
+	if err != nil {
+		log.Panic("log folder not found and was not created by process!")
+	}
 	control := make(chan string)
 	mainLoop := make(chan struct{})
 	go func() {
diff --git a/version b/version
index dc1e644a..9c6d6293 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.6.0
+1.6.1