diff --git a/pwgen/Dockerfile b/pwgen/Dockerfile
index b609877..f0689a6 100644
--- a/pwgen/Dockerfile
+++ b/pwgen/Dockerfile
@@ -1,4 +1,11 @@
+FROM golang:1.15 as builder
+COPY vapid.go /vapid.go
+RUN go get -u github.com/SherClockHolmes/webpush-go
+RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o /vapid /vapid.go
+
 FROM alpine:3.12
 
 RUN apk add --no-cache openldap-passwd-pbkdf2 apache2-utils pwgen opendkim-utils coreutils
 COPY dkim-key.sh /dkim-key.sh
+COPY --from=builder /vapid /vapid
+RUN chmod +x /vapid
diff --git a/pwgen/Makefile b/pwgen/Makefile
index 2f9277d..5febac7 100644
--- a/pwgen/Makefile
+++ b/pwgen/Makefile
@@ -1,6 +1,6 @@
 VERSION=latest
 IMAGE=pwgen
-REGISTRY=registry.0xace.cc
+REGISTRY=registry.0xace.cc/ghp
 
 .PHONY: build push all
 
diff --git a/pwgen/vapid.go b/pwgen/vapid.go
new file mode 100644
index 0000000..b9810f8
--- /dev/null
+++ b/pwgen/vapid.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	webpush "github.com/SherClockHolmes/webpush-go"
+)
+
+func main() {
+  privateKey, publicKey, err := webpush.GenerateVAPIDKeys()
+  print("vapidPrivateKey: ", privateKey, "\n")
+  print("vapidPublicKey: ", publicKey, "\n")
+  if err != nil {
+    // TODO: Handle error
+  }
+}