diff --git a/pkg/upstream/stack/stack.go b/pkg/upstream/stack/stack.go
index b5ab59bf..53a408da 100644
--- a/pkg/upstream/stack/stack.go
+++ b/pkg/upstream/stack/stack.go
@@ -492,7 +492,7 @@ func waitOnService(ctx context.Context, cl *dockerclient.Client, serviceID, serv
 
 	go io.Copy(ioutil.Discard, pipeReader)
 
-	timeout := 60 * time.Second
+	timeout := 30 * time.Second
 
 	select {
 	case err := <-errChan: