diff --git a/pi-hosted_template/template/portainer-v2.json b/pi-hosted_template/template/portainer-v2.json
index c5378bb..9e1fff1 100644
--- a/pi-hosted_template/template/portainer-v2.json
+++ b/pi-hosted_template/template/portainer-v2.json
@@ -5436,13 +5436,42 @@
 				"Other",
 				"VPN"
 			],
-			"description": "You have found the easiest way to install & manage WireGuard on any Linux host!",
-			"image": "weejewel/wg-easy",
+			"description": "Fast VPN Server with easy to use User Interface",
+			"image": "weejewel/wg-easy:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/wireguard.png",
 			"name": "wg-easy",
 			"platform": "linux",
 			"title": "Wireguard Server",
 			"type": 3,
+			"env": [
+				{
+					"default": "example.domain.com",
+					"name": "WG_HOST",
+					"label": "WG_HOST",
+					"description": "Set here your DDNS domain"
+				},
+				{
+					"default": "ENTER AN ADMIN PASSWORD",
+					"name": "PASSWORD",
+					"label": "PASSWORD",
+					"description": "Leave blank to access WebUI without loggin"
+				},
+				{
+					"default": "51820",
+					"name": "WG_PORT",
+					"label": "WG_PORT"
+				},
+				{
+					"default": "1.1.1.1",
+					"name": "WG_DEFAULT_DNS",
+					"label": "WG_DEFAULT_DNS"
+				},
+				{
+					"default": "0.0.0.0/0, ::/0",
+					"name": "WG_ALLOWED_IPS",
+					"label": "WG_ALLOWED_IPS"
+				}
+			],
 			"repository": {
 				"stackfile": "stack/wireguard-easy.yml",
 				"url": "https://github.com/pi-hosted/pi-hosted"
diff --git a/stack/wireguard-easy.yml b/stack/wireguard-easy.yml
index b36a2ac..bd2ca07 100644
--- a/stack/wireguard-easy.yml
+++ b/stack/wireguard-easy.yml
@@ -4,21 +4,21 @@ services:
     environment:
       # ⚠️ Required:
       # Change this to your host's public address
-      - WG_HOST=raspberrypi.local
+      - WG_HOST=${WG_HOST}
 
       # Optional:
-      - PASSWORD=foobar123
-      - WG_PORT=51820
+      - PASSWORD=${PASSWORD}
+      - WG_PORT=${WG_PORT}
       - WG_DEFAULT_ADDRESS=10.8.0.x
-      - WG_DEFAULT_DNS=1.1.1.1
-      - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24
+      - WG_DEFAULT_DNS=${WG_DEFAULT_DNS}
+      - WG_ALLOWED_IPS=${WG_ALLOWED_IPS}
       
     image: weejewel/wg-easy
     container_name: wg-easy
     volumes:
       - /portainer/Files/AppData/Config/wireguard:/etc/wireguard
     ports:
-      - "51820:51820/udp"
+      - "${WG_PORT}:51820/udp"
       - "51821:51821/tcp"
     restart: unless-stopped
     cap_add:
@@ -26,4 +26,4 @@ services:
       - SYS_MODULE
     sysctls:
       - net.ipv4.ip_forward=1
-      - net.ipv4.conf.all.src_valid_mark=1
\ No newline at end of file
+      - net.ipv4.conf.all.src_valid_mark=1
diff --git a/template/portainer-v2-arm32.json b/template/portainer-v2-arm32.json
index a96a241..5350f28 100644
--- a/template/portainer-v2-arm32.json
+++ b/template/portainer-v2-arm32.json
@@ -5402,13 +5402,42 @@
 				"Other",
 				"VPN"
 			],
-			"description": "You have found the easiest way to install & manage WireGuard on any Linux host!",
-			"image": "weejewel/wg-easy",
+			"description": "Fast VPN Server with easy to use User Interface",
+			"image": "weejewel/wg-easy:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/wireguard.png",
 			"name": "wg-easy",
 			"platform": "linux",
 			"title": "Wireguard Server",
 			"type": 3,
+			"env": [
+				{
+					"default": "example.domain.com",
+					"name": "WG_HOST",
+					"label": "WG_HOST",
+					"description": "Set here your DDNS domain"
+				},
+				{
+					"default": "ENTER AN ADMIN PASSWORD",
+					"name": "PASSWORD",
+					"label": "PASSWORD",
+					"description": "Leave blank to access WebUI without loggin"
+				},
+				{
+					"default": "51820",
+					"name": "WG_PORT",
+					"label": "WG_PORT"
+				},
+				{
+					"default": "1.1.1.1",
+					"name": "WG_DEFAULT_DNS",
+					"label": "WG_DEFAULT_DNS"
+				},
+				{
+					"default": "0.0.0.0/0, ::/0",
+					"name": "WG_ALLOWED_IPS",
+					"label": "WG_ALLOWED_IPS"
+				}
+			],
 			"repository": {
 				"stackfile": "stack/wireguard-easy.yml",
 				"url": "https://github.com/pi-hosted/pi-hosted"
diff --git a/template/portainer-v2-arm64.json b/template/portainer-v2-arm64.json
index 2eaea40..2d4efed 100644
--- a/template/portainer-v2-arm64.json
+++ b/template/portainer-v2-arm64.json
@@ -5681,13 +5681,42 @@
 				"Other",
 				"VPN"
 			],
-			"description": "You have found the easiest way to install & manage WireGuard on any Linux host!",
+			"description": "Fast VPN Server with easy to use User Interface",
 			"image": "weejewel/wg-easy:latest",
 			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/wireguard.png",
 			"name": "wg-easy",
 			"platform": "linux",
 			"title": "Wireguard Server",
 			"type": 3,
+			"env": [
+				{
+					"default": "example.domain.com",
+					"name": "WG_HOST",
+					"label": "WG_HOST",
+					"description": "Set here your DDNS domain"
+				},
+				{
+					"default": "ENTER AN ADMIN PASSWORD",
+					"name": "PASSWORD",
+					"label": "PASSWORD",
+					"description": "Leave blank to access WebUI without loggin"
+				},
+				{
+					"default": "51820",
+					"name": "WG_PORT",
+					"label": "WG_PORT"
+				},
+				{
+					"default": "1.1.1.1",
+					"name": "WG_DEFAULT_DNS",
+					"label": "WG_DEFAULT_DNS"
+				},
+				{
+					"default": "0.0.0.0/0, ::/0",
+					"name": "WG_ALLOWED_IPS",
+					"label": "WG_ALLOWED_IPS"
+				}
+			],
 			"repository": {
 				"stackfile": "stack/wireguard-easy.yml",
 				"url": "https://github.com/pi-hosted/pi-hosted"