diff --git a/Dockerfile b/Dockerfile
index b2303ed..f68e38a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,23 @@
-FROM golang:1.16-buster as go
+ARG VPP_VERSION=v22.02-rc0-100-gac6dd7c7f
+FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as go
+COPY --from=golang:1.16.3-buster /usr/local/go/ /go
+ENV PATH ${PATH}:/go/bin
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOBIN=/bin
+RUN rm -r /etc/vpp
 RUN go get github.com/go-delve/delve/cmd/dlv@v1.6.0
+RUN go get github.com/grpc-ecosystem/grpc-health-probe@v0.4.1
 RUN go get github.com/edwarnicke/dl
-RUN dl https://github.com/spiffe/spire/releases/download/v0.11.1/spire-0.11.1-linux-x86_64-glibc.tar.gz | \
-    tar -xzvf - -C /bin --strip=3 ./spire-0.11.1/bin/spire-server ./spire-0.11.1/bin/spire-agent
+RUN dl \
+    https://github.com/spiffe/spire/releases/download/v0.9.3/spire-0.9.3-linux-x86_64-glibc.tar.gz | \
+    tar -xzvf - -C /bin --strip=3 ./spire-0.9.3/bin/spire-server ./spire-0.9.3/bin/spire-agent
 
 FROM go as build
 WORKDIR /build
+COPY go.mod go.sum ./
 COPY . .
-RUN go build -o /bin/app .
+RUN go build -o /bin/nse-vlan-vpp .
 
 FROM build as test
 CMD go test -test.v ./...
@@ -18,6 +25,6 @@ CMD go test -test.v ./...
 FROM test as debug
 CMD dlv -l :40000 --headless=true --api-version=2 test -test.v ./...
 
-FROM alpine as runtime
-COPY --from=build /bin/app /bin/app
-CMD /bin/app
\ No newline at end of file
+FROM ghcr.io/edwarnicke/govpp/vpp:${VPP_VERSION} as runtime
+COPY --from=build /bin/nse-vlan-vpp /bin/nse-vlan-vpp
+ENTRYPOINT ["/bin/nse-vlan-vpp"]