diff --git a/dagger_go_template.yaml b/dagger_go_template.yaml
index 1384958..2114669 100644
--- a/dagger_go_template.yaml
+++ b/dagger_go_template.yaml
@@ -18,7 +18,7 @@ steps:
       - mkdir -p tmp/dagger-go
       - git clone "https://git.front.kjuulh.io/kjuulh/dagger-go.git" tmp/dagger-go
       - docker build -t dagger-go-builder:${DRONE_COMMIT} -f tmp/dagger-go/Dockerfile .
-      - 'docker run -v /var/run/docker.sock:/var/run/docker.sock dagger-go-builder:${DRONE_COMMIT} ./dagger-go build {{ or .input.imageTag $imageTag }}'
+      - 'docker run -v /var/run/docker.sock:/var/run/docker.sock dagger-go-builder:${DRONE_COMMIT} ./dagger-go build "{{ or .input.imageTag $imageTag }}"'
 
 services:
   - name: docker
diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go
index d36ea60..9d3797f 100644
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 
+	"git.front.kjuulh.io/kjuulh/dagger-go/pkg/tasks"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +24,11 @@ func Build(requirementsf func(*cobra.Command), buildf func(ctx context.Context)
 				log.Printf("Building image: %s\n", imageTag)
 			}
 
-			return buildf(cmd.Context())
+			if buildf != nil {
+				return buildf(cmd.Context())
+			}
+
+			return tasks.Build(imageTag)
 		},
 	}