diff --git a/core/installer/cmd/env_manager.go b/core/installer/cmd/env_manager.go
index e177c08..196110f 100644
--- a/core/installer/cmd/env_manager.go
+++ b/core/installer/cmd/env_manager.go
@@ -69,11 +69,16 @@
 	if err != nil {
 		return err
 	}
+	dnsFetcher, err := newZoneFetcher()
+	if err != nil {
+		return err
+	}
 	s := welcome.NewEnvServer(
 		envManagerFlags.port,
 		ss,
 		repoIO,
 		nsCreator,
+		dnsFetcher,
 		installer.NewFixedLengthRandomNameGenerator(4),
 	)
 	log.Printf("Starting server\n")
diff --git a/core/installer/cmd/kube.go b/core/installer/cmd/kube.go
index 995aec3..d06ae59 100644
--- a/core/installer/cmd/kube.go
+++ b/core/installer/cmd/kube.go
@@ -5,9 +5,9 @@
 )
 
 func newNSCreator() (installer.NamespaceCreator, error) {
-	if rootFlags.kubeConfig != "" {
-		return installer.NewOutOfClusterNamespaceCreator(rootFlags.kubeConfig)
-	} else {
-		return installer.NewInClusterNamespaceCreator()
-	}
+	return installer.NewNamespaceCreator(rootFlags.kubeConfig)
+}
+
+func newZoneFetcher() (installer.ZoneStatusFetcher, error) {
+	return installer.NewZoneStatusFetcher(rootFlags.kubeConfig)
 }