diff --git a/wireguard/Dockerfile b/wireguard/Dockerfile
index 56e9590..26dd6b1 100755
--- a/wireguard/Dockerfile
+++ b/wireguard/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -10,10 +10,10 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
     apk add --no-cache --virtual .build-dependencies \
         build-base=0.5-r2 \
-        git=2.34.1-r0 \
+        git=2.36.1-r0 \
     \
     && apk add --no-cache \
-        go=1.17.4-r0 \
+        go=1.18.2-r0 \
         libqrencode=4.1.1-r0 \
         openresolv=3.12.0-r0 \
         wireguard-tools=1.0.20210914-r0 \
diff --git a/wireguard/build.yaml b/wireguard/build.yaml
index ef8af69..d92404c 100644
--- a/wireguard/build.yaml
+++ b/wireguard/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.0.0
-  amd64: ghcr.io/hassio-addons/base/amd64:11.0.0
-  armhf: ghcr.io/hassio-addons/base/armhf:11.0.0
-  armv7: ghcr.io/hassio-addons/base/armv7:11.0.0
-  i386: ghcr.io/hassio-addons/base/i386:11.0.0
+  aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
+  amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
+  armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
+  armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
+  i386: ghcr.io/hassio-addons/base/i386:12.0.0
diff --git a/wireguard/rootfs/etc/cont-init.d/config.sh b/wireguard/rootfs/etc/cont-init.d/config.sh
old mode 100644
new mode 100755
index bdd5e23..34f9a1a
--- a/wireguard/rootfs/etc/cont-init.d/config.sh
+++ b/wireguard/rootfs/etc/cont-init.d/config.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: WireGuard
 # Creates the interface configuration
diff --git a/wireguard/rootfs/etc/services.d/api/run b/wireguard/rootfs/etc/services.d/api/run
index 6ee89f4..bad7b35 100644
--- a/wireguard/rootfs/etc/services.d/api/run
+++ b/wireguard/rootfs/etc/services.d/api/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: WireGuard
 # The most simple HTTP API you've ever seen.
diff --git a/wireguard/rootfs/etc/services.d/status/run b/wireguard/rootfs/etc/services.d/status/run
index 25a0452..a952d72 100644
--- a/wireguard/rootfs/etc/services.d/status/run
+++ b/wireguard/rootfs/etc/services.d/status/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: WireGuard
 # Shows current WireGuard status
diff --git a/wireguard/rootfs/etc/services.d/wireguard/run b/wireguard/rootfs/etc/services.d/wireguard/run
index 0c9cd21..af73205 100644
--- a/wireguard/rootfs/etc/services.d/wireguard/run
+++ b/wireguard/rootfs/etc/services.d/wireguard/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: WireGuard
 # Runs WireGuard