diff --git a/templates.json b/templates.json
index 651bc608f..bedcd2dd6 100644
--- a/templates.json
+++ b/templates.json
@@ -408,30 +408,6 @@
       "21/tcp", "80/tcp", "443/tcp", "8880/tcp", "8443/tcp", "8447/tcp"
     ]
   },
-  {
-    "type": 1,
-    "title": "WordPress",
-    "description": "A free and open-source CMS",
-    "categories": ["CMS"],
-    "platform": "linux",
-    "logo": "https://portainer.io/images/logos/wordpress.png",
-    "image": "wordpress:latest",
-    "env": [
-      {
-        "name": "WORDPRESS_DB_HOST",
-        "label": "MySQL database host",
-        "type": "container"
-      },
-      {
-        "name": "WORDPRESS_DB_PASSWORD",
-        "label": "Database password"
-      }
-    ],
-    "ports": [
-      "80/tcp"
-    ],
-    "volumes": [{"container": "/var/www/html"}]
-  },
   {
     "type": 1,
     "title": "Joomla",
@@ -777,7 +753,27 @@
     },
     "env": [
       {
-        "name": "MYSQL_ROOT_PASSWORD",
+        "name": "MYSQL_DATABASE_PASSWORD",
+        "label": "Database root password",
+        "description": "Password used by the MySQL root user."
+      }
+    ]
+  },
+  {
+    "type": 3,
+    "title": "Wordpress",
+    "description": "Wordpress setup with a MySQL database",
+    "note": "Deploys a Wordpress instance connected to a MySQL database.",
+    "categories": ["CMS"],
+    "platform": "linux",
+    "logo": "https://portainer.io/images/logos/wordpress.png",
+    "repository": {
+      "url": "https://github.com/portainer/templates",
+      "stackfile": "stacks/wordpress/docker-compose.yml"
+    },
+    "env": [
+      {
+        "name": "MYSQL_DATABASE_PASSWORD",
         "label": "Database root password",
         "description": "Password used by the MySQL root user."
       }
@@ -827,12 +823,6 @@
         "name": "SPM_TOKEN",
         "label": "SPM monitoring token"
       }
-    ],
-    "volumes": [
-      {
-        "container": "/var/run/docker.sock",
-        "bind": "/var/run/docker.sock"
-      }
     ]
   }
 ]