diff --git a/.drone.yml b/.drone.yml
index 49ce617..395e7f6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ kind: pipeline
 name: "shuttle-drone-templates"
 steps:
   - name: "build"
-    image: docker.io/kasperhermansen/shuttle-drone:1680891892542
+    image: docker.io/kasperhermansen/shuttle-drone:1680892391631
     volumes:
       - name: dockersock
         path: /var/run
diff --git a/shuttletask/build.go b/shuttletask/build.go
index 3929356..bf2b9e6 100644
--- a/shuttletask/build.go
+++ b/shuttletask/build.go
@@ -34,6 +34,15 @@ func Build(ctx context.Context) error {
 
 	ctx = context.Background()
 
+	shuttleGit := client.
+		Git("git@github.com:kjuulh/shuttle.git", dagger.GitOpts{
+			KeepGitDir: true,
+		}).
+		Branch("shuttletask").
+		Tree(dagger.GitRefTreeOpts{
+			SSHAuthSocket: client.Host().UnixSocket(os.Getenv("SSH_AUTH_SOCK")),
+		})
+
 	for _, platform := range platforms {
 		platform := platform
 
@@ -42,13 +51,6 @@ func Build(ctx context.Context) error {
 
 			golangDir := golang.Directory("/usr/local/go")
 
-			shuttleGit := client.
-				Git("git@github.com:kjuulh/shuttle.git").
-				Branch("shuttletask").
-				Tree(dagger.GitRefTreeOpts{
-					SSHAuthSocket: client.Host().UnixSocket(os.Getenv("SSH_AUTH_SOCK")),
-				})
-
 			shuttleImg := golang.
 				WithDirectory("/app", shuttleGit).
 				WithWorkdir("/app").
diff --git a/shuttletask/go.mod b/shuttletask/go.mod
index 792be65..9f1951e 100644
--- a/shuttletask/go.mod
+++ b/shuttletask/go.mod
@@ -2,7 +2,7 @@ module shuttletask
 
 go 1.20
 
-replace github.com/lunarway/shuttle => github.com/kjuulh/shuttle v0.0.0-20230407181904-c33b3e1dae47
+replace github.com/lunarway/shuttle => github.com/kjuulh/shuttle v0.0.0-20230407180512-4877329375cb
 
 require (
 	dagger.io/dagger v0.6.0