diff --git a/core/installer/bootstrapper.go b/core/installer/bootstrapper.go
index 298efc3..e8b77ec 100644
--- a/core/installer/bootstrapper.go
+++ b/core/installer/bootstrapper.go
@@ -417,7 +417,7 @@
 			return err
 		}
 		namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-		appDir := filepath.Join("/infrastructure", app.Name())
+		appDir := filepath.Join("/infrastructure", app.Slug())
 		return mgr.Install(app, appDir, namespace, map[string]any{})
 	}
 	appsToInstall := []string{
@@ -511,7 +511,7 @@
 		return err
 	}
 	namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-	appDir := filepath.Join("/infrastructure", app.Name())
+	appDir := filepath.Join("/infrastructure", app.Slug())
 	return mgr.Install(app, appDir, namespace, map[string]any{
 		"repoIP":        env.ServiceIPs.ConfigRepo,
 		"repoPort":      22,
@@ -537,7 +537,7 @@
 		return err
 	}
 	namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-	appDir := filepath.Join("/infrastructure", app.Name())
+	appDir := filepath.Join("/infrastructure", app.Slug())
 	return mgr.Install(app, appDir, namespace, map[string]any{
 		"sshPrivateKey": string(keys.RawPrivateKey()),
 	})
@@ -549,7 +549,7 @@
 		return err
 	}
 	namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-	appDir := filepath.Join("/infrastructure", app.Name())
+	appDir := filepath.Join("/infrastructure", app.Slug())
 	return mgr.Install(app, appDir, namespace, map[string]any{})
 }
 
@@ -559,7 +559,7 @@
 		return err
 	}
 	namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-	appDir := filepath.Join("/infrastructure", app.Name())
+	appDir := filepath.Join("/infrastructure", app.Slug())
 	return mgr.Install(app, appDir, namespace, map[string]any{
 		"servers": []EnvDNS{},
 	})
@@ -571,7 +571,7 @@
 		return err
 	}
 	namespace := fmt.Sprintf("%s-%s", env.InfraName, app.Namespace())
-	appDir := filepath.Join("/infrastructure", app.Name())
+	appDir := filepath.Join("/infrastructure", app.Slug())
 	return mgr.Install(app, appDir, namespace, map[string]any{})
 }
 
