diff --git a/cmd/hepto/service.go b/cmd/hepto/service.go
index c7a12924b76d468bbff5e079c4f3f71ea8709a58..fbeeb6f5b3c755f54b16493cb82b6c9554aecff0 100644
--- a/cmd/hepto/service.go
+++ b/cmd/hepto/service.go
@@ -78,10 +78,20 @@ var Start = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		newArgs := append([]string{Run.Use}, os.Args[2:]...)
-		return selfcontain.RunWithArgs(&config.Container, newArgs)
+		// This is a hack while waiting for some refactoring in selfcontain
+		errChan := make(chan error)
+		go func() {
+			errChan <- selfcontain.RunWithArgs(&config.Container, newArgs)
+		}()
+		go apiserverForward(errChan)
+		return <-errChan
 	},
 }
 
+func apiserverForward(chan error) {
+	// do nothing for now
+}
+
 var Run = &cobra.Command{
 	Use:   "run",
 	Short: "Actually run hepto inside the container",