diff --git a/.drone.yml b/.drone.yml
index 12bc6a5..3811f4e 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:1680893274918
+    image: docker.io/kasperhermansen/shuttle-drone:1680893418457
     volumes:
       - name: dockersock
         path: /var/run
diff --git a/shuttletask/build.go b/shuttletask/build.go
index 02fb81b..e673b96 100644
--- a/shuttletask/build.go
+++ b/shuttletask/build.go
@@ -49,8 +49,6 @@ func Build(ctx context.Context) error {
 		egrp.Go(func() error {
 			golang := client.Container().From("golang:1.20.3")
 
-			golangDir := golang.Directory("/usr/local/go")
-
 			shuttleImg := golang.
 				WithDirectory("/app", shuttleGit).
 				WithWorkdir("/app").
@@ -79,9 +77,8 @@ func Build(ctx context.Context) error {
 				Container(dagger.ContainerOpts{
 					Platform: platform,
 				}).
-				From("debian").
+				From("golang:1.20.3").
 				WithWorkdir("/app").
-				WithDirectory("/usr/local/bin/go", golangDir).
 				WithFile("/usr/local/bin/shuttle", shuttle).
 				WithExec([]string{"shuttle", "version"})
 			if _, err := image.ExitCode(ctx); err != nil {