diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index 164058e4..38f19973 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -5,7 +5,7 @@ builds:
     id: nats-server
     binary: nats-server
     ldflags:
-      - -w -X github.com/nats-io/nats-server/server.gitCommit={{.ShortCommit}}
+      - -w -X github.com/nats-io/nats-server/v2/server.gitCommit={{.ShortCommit}}
     env:
       - GO111MODULE=on
       - CGO_ENABLED=0
diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly
index 54d05cf3..21521d8d 100644
--- a/docker/Dockerfile.nightly
+++ b/docker/Dockerfile.nightly
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine AS builder
+FROM golang:1.17-alpine AS builder
 
 ARG VERSION="nightly"