diff --git a/BUILDER.md b/BUILDER.md
index b8d4a8c8..1e15a6c6 100644
--- a/BUILDER.md
+++ b/BUILDER.md
@@ -18,6 +18,7 @@ docker run --rm -v $(pwd):/install -e PLUGINS=git,filebrowser abiosoft/caddy:bui
 ### Environment Variables
 
 - `PLUGINS` - comma separated Caddy plugins. e.g. `-e PLUGINS=git,linode`
-- `VERSION` - Caddy version or repository branch. Default `1.0.3`
+- `VERSION` - Caddy version or repository branch. Default `2.0.0`
 - `ENABLE_TELEMETRY` - Enable telemetry stats. Options `true`|`false`. Default `true`
-- `GOOS`, `GOARCH` and `GOARM` are all supported. Default `GOOS=linux`, `GOARCH=amd64`
+- `GOOS`, `GOARCH` and `GOARM` are all supported, but buildkit is the new way
+  to specify architecture
diff --git a/Dockerfile b/Dockerfile
index b4980297..38a8c2e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 #
 # Builder
 #
-FROM abiosoft/caddy:builder as builder
+FROM paullj1/caddy:builder as builder
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 ARG plugins="git,cors,realip,expires,cache,cloudflare"
 ARG enable_telemetry="true"
 
@@ -15,10 +15,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} /
 #
 # Final stage
 #
-FROM alpine:3.10
+FROM alpine:3.11
 LABEL maintainer "Abiola Ibrahim <abiola89@gmail.com>"
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 LABEL caddy_version="$version"
 
 # Let's Encrypt Agreement
diff --git a/Dockerfile-no-stats b/Dockerfile-no-stats
index f45251ff..908eb9c9 100644
--- a/Dockerfile-no-stats
+++ b/Dockerfile-no-stats
@@ -3,7 +3,7 @@
 #
 FROM abiosoft/caddy:builder as builder
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 ARG plugins="git,cors,realip,expires,cache,cloudflare"
 
 # process wrapper
@@ -14,10 +14,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi
 #
 # Final stage
 #
-FROM alpine:3.10
+FROM alpine:3.11
 LABEL maintainer "Abiola Ibrahim <abiola89@gmail.com>"
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 LABEL caddy_version="$version"
 
 # Let's Encrypt Agreement
diff --git a/README.md b/README.md
index 218efa4f..6528491f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ A [Docker](https://docker.com) image for [Caddy](https://caddyserver.com). This
 Plugins can be configured via the [`plugins` build arg](#custom-plugins).
 
 [![](https://images.microbadger.com/badges/image/abiosoft/caddy.svg)](https://microbadger.com/images/abiosoft/caddy "Get your own image badge on microbadger.com")
-[![](https://img.shields.io/badge/version-1.0.3-blue.svg)](https://github.com/caddyserver/caddy/tree/v1.0.3)
+[![](https://img.shields.io/badge/version-2.0.0-blue.svg)](https://github.com/caddyserver/caddy/tree/v2.0.0)
 
 Check [abiosoft/caddy:builder](https://github.com/abiosoft/caddy-docker/blob/master/BUILDER.md) for generating cross-platform Caddy binaries.
 
diff --git a/builder/builder.sh b/builder/builder.sh
index 3ab339f7..c8018dbe 100644
--- a/builder/builder.sh
+++ b/builder/builder.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=${VERSION:-"1.0.3"}
+VERSION=${VERSION:-"2.0.0"}
 TELEMETRY=${ENABLE_TELEMETRY:-"true"}
 IMPORT="github.com/caddyserver/caddy"
 
@@ -131,7 +131,7 @@ end_stage
 
 # plugin helper
 stage "installing plugin helper"
-GOOS=linux GOARCH=amd64 go get -v github.com/abiosoft/caddyplug/caddyplug
+GOOS=linux go get -v github.com/abiosoft/caddyplug/caddyplug
 end_stage
 
 # check for modules support
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 00000000..957ffe82
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,24 @@
+
+group "default" {
+  targets = ["caddy", "builder"]
+}
+
+target "caddy" {
+  context = "./"
+  dockerfile = "Dockerfile"
+  output = ["type=registry"]
+  driver = "docker-container"
+  tags = ["docker.io/paullj1/caddy:latest",
+          "docker.io/paullj1/caddy:2.0.0" ]
+  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
+}
+
+target "builder" {
+  context = "./builder/"
+  dockerfile = "Dockerfile"
+  output = ["type=registry"]
+  driver = "docker-container"
+  tags = ["docker.io/paullj1/caddy:builder"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
+}
+
diff --git a/php/Dockerfile b/php/Dockerfile
index 5c2935c3..a73e8b76 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -3,7 +3,7 @@
 #
 FROM abiosoft/caddy:builder as builder
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 ARG plugins="git,cors,realip,expires,cache,cloudflare"
 ARG enable_telemetry="true"
 
@@ -15,10 +15,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=${enable_telemetry} /
 #
 # Final Stage
 #
-FROM alpine:3.10
+FROM alpine:3.11
 LABEL maintainer "Abiola Ibrahim <abiola89@gmail.com>"
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 LABEL caddy_version="$version"
 
 # PHP www-user UID and GID
diff --git a/php/Dockerfile-no-stats b/php/Dockerfile-no-stats
index e81b3725..1b6f7435 100644
--- a/php/Dockerfile-no-stats
+++ b/php/Dockerfile-no-stats
@@ -3,7 +3,7 @@
 #
 FROM abiosoft/caddy:builder as builder
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 ARG plugins="git,cors,realip,expires,cache,cloudflare"
 
 # Process Wrapper
@@ -14,10 +14,10 @@ RUN VERSION=${version} PLUGINS=${plugins} ENABLE_TELEMETRY=false /bin/sh /usr/bi
 #
 # Final Stage
 #
-FROM alpine:3.10
+FROM alpine:3.11
 LABEL maintainer "Abiola Ibrahim <abiola89@gmail.com>"
 
-ARG version="1.0.3"
+ARG version="2.0.0"
 LABEL caddy_version="$version"
 
 # PHP www-user UID and GID