diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index dcccf17..1dd9bfc 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,15 +1,16 @@
-FROM alpine as godeps
-RUN apk --no-cache add go
-RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
+FROM ubuntu as godeps
+RUN apt update && apt install -y golang && apt dist-upgrade -y
+RUN go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
 RUN go install github.com/go-task/task/v3/cmd/task@latest
 RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
-FROM alpine
-RUN apk --no-cache add go nodejs yarn bash curl git git-perl
+FROM ubuntu
+RUN apt update && apt install -y golang nodejs yarn bash curl git && apt dist-upgrade -y
 ENV PATH="/root/.yarn/bin/:${PATH}"
 WORKDIR /src/web
 ADD web/package.json web/yarn.lock /src/web/
 WORKDIR /src
 VOLUME /go
 VOLUME /.cache
-COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
\ No newline at end of file
+RUN yarn
+COPY --from=godeps /root/go/bin/task /root/go/bin/sqlc /root/go/bin/golangci-lint /usr/local/bin/
diff --git a/docker/dev.sh b/docker/dev.sh
index 6b9bcbd..01d912c 100755
--- a/docker/dev.sh
+++ b/docker/dev.sh
@@ -2,6 +2,6 @@
 
 tmux new-session -d -s watch 'cd web; yarn dev'
 tmux split-window;
-tmux send 'task -w run' ENTER;
+tmux send 'go-task -w run' ENTER;
 tmux split-window;
-tmux a;
\ No newline at end of file
+tmux a;