diff --git a/Dockerfile b/Dockerfile
index cb9e1be..bd9030a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:edge as buildstage
 
 # build variables
 ARG SYNCTHING_RELEASE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 560a84b..aed30d0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge as buildstage
 
 # build variables
 ARG SYNCTHING_RELEASE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d89e020..27b22fa 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge as buildstage
 
 # build variables
 ARG SYNCTHING_RELEASE
diff --git a/README.md b/README.md
index f6677c6..0d572aa 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **03.05.21:** - Rebase to alpine 3.15.
+* **03.05.21:** - Rebase to alpine 3.15 (builds on edge for go 1.18).
 * **05.10.21:** - Rebase to alpine 3.14.
 * **12.05.21:** - Remove sysctl parameter again
 * **03.05.21:** - Raise maximum UDP buffer size.
diff --git a/readme-vars.yml b/readme-vars.yml
index 665f039..ae4acbd 100755
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -43,7 +43,7 @@ app_setup_nginx_reverse_proxy_block: ""
 # changelog
 
 changelogs:
-  - { date: "03.05.21:", desc: "Rebase to alpine 3.15." }
+  - { date: "03.05.21:", desc: "Rebase to alpine 3.15 (builds on edge for go 1.18)." }
   - { date: "05.10.21:", desc: "Rebase to alpine 3.14." }
   - { date: "12.05.21:", desc: "Remove sysctl parameter again" }
   - { date: "03.05.21:", desc: "Raise maximum UDP buffer size." }