diff --git a/build.sh b/build.sh
index 4be5dde..54abb12 100644
--- a/build.sh
+++ b/build.sh
@@ -101,13 +101,15 @@ do
     process_templates "/etc/bind/$netname/" "$sigil_vars"
 	
 	# Wireguard
-    #  Remove existing configuration
-    rm -v -rf /etc/wireguard/$netname/*
-    #  Copy all bind default files to /etc/(bind)
-    find wireguard -type d | sed -e "s@wireguard@wireguard/${netname}@g" | xargs -I '{}' mkdir --verbose -p /etc/{}
-    find wireguard -type f | sed -e "s@wireguard/@@g" | xargs -I '{}' cp --verbose wireguard/{} /etc/wireguard/$netname/{}
-    #  Fill out templates and remove them after
-    process_templates "/etc/wireguard/$netname/" "$sigil_vars"
+	if [ $wg_enabled -eq "1" ]; then
+		#  Remove existing configuration
+		rm -v -rf /etc/wireguard/$netname/*
+		#  Copy all bind default files to /etc/(bind)
+		find wireguard -type d | sed -e "s@wireguard@wireguard/${netname}@g" | xargs -I '{}' mkdir --verbose -p /etc/{}
+		find wireguard -type f | sed -e "s@wireguard/@@g" | xargs -I '{}' cp --verbose wireguard/{} /etc/wireguard/$netname/{}
+		#  Fill out templates and remove them after
+		process_templates "/etc/wireguard/$netname/" "$sigil_vars"
+	fi
     
     # Docker
     #  Copy templates and dependencies to directory
diff --git a/docker/services/wireguard b/docker/services/wireguard
index ad8e7d9..c526be0 100644
--- a/docker/services/wireguard
+++ b/docker/services/wireguard
@@ -1,4 +1,4 @@
-    image: ghcr.io/linuxserver/wireguard
+{{ if eq "1" "${wg_enabled:-0}" }}    image: ghcr.io/linuxserver/wireguard
     container_name: wireguard
     volumes:
       - /etc/wireguard/${netname}:/config
@@ -16,4 +16,4 @@
     depends_on:
       - tinc
     sysctls:
-      - net.ipv4.conf.all.src_valid_mark=1
+      - net.ipv4.conf.all.src_valid_mark=1{{ end }}
\ No newline at end of file