diff --git a/VERSION b/VERSION
index 60453e69..13637f44 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.0.0
\ No newline at end of file
+v1.0.3
\ No newline at end of file
diff --git a/cmd/build.go b/cmd/build.go
index 6a807efa..54d937cc 100644
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -23,10 +23,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const buildLongDesc = `
+const (
+	buildLongDesc = `
 This command can be used to build images.
 `
 
+	// 8 hours
+	timeoutInSec = 60 * 60 * 8
+)
+
 type buildCmd struct {
 	out             io.Writer
 	context         string
@@ -128,7 +133,8 @@ func (b *buildCmd) run(cmd *cobra.Command, args []string) error {
 
 	taskManager := taskmanager.NewTaskManager(b.dryRun)
 	defaultStep := &graph.Step{
-		Run: rendered,
+		Run:     rendered,
+		Timeout: timeoutInSec,
 	}
 
 	steps := []*graph.Step{defaultStep}
diff --git a/graph/pipeline.go b/graph/pipeline.go
index 0a90fa5c..02147ba2 100644
--- a/graph/pipeline.go
+++ b/graph/pipeline.go
@@ -133,7 +133,7 @@ func (p *Pipeline) initialize() error {
 	for i, s := range p.Steps {
 		// If individual steps don't have step timeouts specified,
 		// stamp the global timeout on them.
-		if s.Timeout == 0 {
+		if s.Timeout <= 0 {
 			s.Timeout = p.StepTimeout
 		}