diff --git a/cmd/actions/root.go b/cmd/actions/root.go
index 1619860..4502db7 100644
--- a/cmd/actions/root.go
+++ b/cmd/actions/root.go
@@ -2,6 +2,7 @@ package actions
 
 import (
 	"github.com/foomo/squadron/util"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
diff --git a/squadron.go b/squadron.go
index 79547a0..cf2f395 100644
--- a/squadron.go
+++ b/squadron.go
@@ -79,7 +79,7 @@ func (sq Squadron) Config() (string, error) {
 }
 
 func (sq Squadron) Generate(units map[string]Unit) error {
-	chartPath := path.Join(sq.basePath, defaultOutputDir, "default", sq.name)
+	chartPath := path.Join(sq.basePath, defaultOutputDir, sq.name)
 	// cleanup old files
 	if err := sq.cleanupOutput(chartPath); err != nil {
 		return err
@@ -109,8 +109,8 @@ func (sq Squadron) Down(helmArgs []string) error {
 	return err
 }
 
-func (sq Squadron) Up(units map[string]Unit, namespace string, helmArgs []string) error {
-	chartPath := path.Join(sq.basePath, defaultOutputDir, namespace, sq.name)
+func (sq Squadron) Up(units map[string]Unit, helmArgs []string) error {
+	chartPath := path.Join(sq.basePath, defaultOutputDir, sq.name)
 	// cleanup old files
 	if err := sq.cleanupOutput(chartPath); err != nil {
 		return err