diff --git a/dagger/main.go b/dagger/main.go
index 69a32ef9d..99f85597c 100644
--- a/dagger/main.go
+++ b/dagger/main.go
@@ -234,7 +234,8 @@ func (h *Headway) TileserverServeContainer(ctx context.Context) *dagger.Containe
 		WithFile("/app/package.json", h.ServiceDir("tileserver").File("package.json")).
 		WithFile("/app/yarn.lock", h.ServiceDir("tileserver").File("yarn.lock")).
 		WithWorkdir("/app").
-		WithExec([]string{"yarn", "install", "--prod", "--frozen-lockfile"})
+		WithExec([]string{"yarn", "install", "--prod", "--frozen-lockfile", "--ignore-scripts"}).
+		WithExec([]string{"sh", "-c", "cd node_modules/sqlite3 && yarn run install"})
 
 	builtAssets := h.TileserverAssets(ctx)
 
@@ -485,8 +486,10 @@ func (h *Headway) WebBuild(ctx context.Context,
 	}
 
 	return container.
-		WithExec([]string{"yarn", "install", "--frozen-lockfile"}).
+		WithExec([]string{"yarn", "install", "--frozen-lockfile", "--ignore-scripts"}).
 		WithExec([]string{"yarn", "build"}).
+		// Strip devDependencies from final image
+		WithExec([]string{"yarn", "install", "--frozen-lockfile", "--ignore-scripts", "--prod"}).
 		Directory("/www-app/dist/spa")
 }
 
diff --git a/dagger/pelias.go b/dagger/pelias.go
index 447e9d8ca..5f400c4d7 100644
--- a/dagger/pelias.go
+++ b/dagger/pelias.go
@@ -24,9 +24,11 @@ func (h *Headway) Pelias(ctx context.Context) *Pelias {
 		WithDirectory("generate_config", h.ServiceDir("pelias").Directory("generate_config")).
 		WithWorkdir("generate_config").
 		WithFile("areas.csv", h.ServicesDir.File("areas.csv")).
-		WithExec([]string{"yarn", "install"}).
+		WithExec([]string{"yarn", "install", "--frozen-lockfile", "--ignore-scripts"}).
 		WithExec([]string{"yarn", "build"}).
 		WithExec([]string{"sh", "-c", fmt.Sprintf("bin/generate-pelias-config areas.csv '%s' '%s' > pelias.json", h.Area, countriesStr)}).
+		// Strip devDependencies from final image
+		WithExec([]string{"yarn", "install", "--prod", "--frozen-lockfile", "--ignore-scripts"}).
 		File("pelias.json")
 
 	return &Pelias{Config: config, Headway: h}