diff --git a/templates/compose/wireguard-easy.yaml b/templates/compose/wireguard-easy.yaml
index f0ada4dcf..7ccf60554 100644
--- a/templates/compose/wireguard-easy.yaml
+++ b/templates/compose/wireguard-easy.yaml
@@ -3,24 +3,23 @@
 # tags: wireguard,vpn,web,admin
 # logo: svgs/wireguard.svg
 # port: 8000
+
 services:
   wg-easy:
-    image: ghcr.io/wg-easy/wg-easy
+    image: ghcr.io/wg-easy/wg-easy:latest
     environment:
       - SERVICE_FQDN_WIREGUARDEASY_8000
-      - LANG=en
-      - WG_HOST=$SERVICE_FQDN_WIREGUARDEASY
+      - WG_HOST=${SERVICE_FQDN_WIREGUARDEASY}
+      - LANG=${LANG:-en}
       - PORT=8000
       - WG_PORT=51820
     volumes:
       - wg-easy:/etc/wireguard
     ports:
-      - "51820:51820/udp"
-      - "8000:8000/tcp"
+      - 51820:51820/udp
     cap_add:
       - NET_ADMIN
       - SYS_MODULE
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
       - net.ipv4.ip_forward=1
-    restart: unless-stopped
diff --git a/templates/service-templates.json b/templates/service-templates.json
index cc03e2e1d..62b76ec85 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -2642,6 +2642,20 @@
         "minversion": "0.0.0",
         "port": "8000"
     },
+    "wireguard-easy": {
+        "documentation": "https://github.com/wg-easy/wg-easy?utm_source=coolify.io",
+        "slogan": "The easiest way to run WireGuard VPN + Web-based Admin UI.",
+        "compose": "c2VydmljZXM6CiAgd2ctZWFzeToKICAgIGltYWdlOiAnZ2hjci5pby93Zy1lYXN5L3dnLWVhc3k6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX1dJUkVHVUFSREVBU1lfODAwMAogICAgICAtICdXR19IT1NUPSR7U0VSVklDRV9GUUROX1dJUkVHVUFSREVBU1l9JwogICAgICAtICdMQU5HPSR7TEFORzotZW59JwogICAgICAtIFBPUlQ9ODAwMAogICAgICAtIFdHX1BPUlQ9NTE4MjAKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3dnLWVhc3k6L2V0Yy93aXJlZ3VhcmQnCiAgICBwb3J0czoKICAgICAgLSAnNTE4MjA6NTE4MjAvdWRwJwogICAgY2FwX2FkZDoKICAgICAgLSBORVRfQURNSU4KICAgICAgLSBTWVNfTU9EVUxFCiAgICBzeXNjdGxzOgogICAgICAtIG5ldC5pcHY0LmNvbmYuYWxsLnNyY192YWxpZF9tYXJrPTEKICAgICAgLSBuZXQuaXB2NC5pcF9mb3J3YXJkPTEK",
+        "tags": [
+            "wireguard",
+            "vpn",
+            "web",
+            "admin"
+        ],
+        "logo": "svgs/wireguard.svg",
+        "minversion": "0.0.0",
+        "port": "8000"
+    },
     "wordpress-with-mariadb": {
         "documentation": "https://wordpress.org?utm_source=coolify.io",
         "slogan": "Wordpress is open source software you can use to create a beautiful website, blog, or app.",