diff --git a/stacks/portainer-agent/docker-stack.yml b/stacks/portainer-agent/docker-stack.yml
new file mode 100644
index 0000000..ebf7866
--- /dev/null
+++ b/stacks/portainer-agent/docker-stack.yml
@@ -0,0 +1,22 @@
+version: '3.2'
+
+services:
+  agent:
+    image: portainer/agent
+    environment:
+      AGENT_CLUSTER_ADDR: tasks.agent
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+      - target: 9001
+        published: 9001
+        protocol: tcp
+        mode: host
+    networks:
+      - portainer_agent
+    deploy:
+      mode: global
+
+networks:
+  portainer_agent:
+    driver: overlay
diff --git a/templates.json b/templates.json
index 7d1bb73..2c4c13f 100644
--- a/templates.json
+++ b/templates.json
@@ -695,6 +695,19 @@
     ],
     "volumes": ["/data/contentbox/db", "/app/includes/shared/media"]
   },
+  {
+    "type": "stack",
+    "title": "Portainer Agent",
+    "description": "Manage all the resources in your Swarm cluster",
+    "note": "The agent will be deployed globally inside your cluster and available on port 9001.",
+    "categories": ["portainer"],
+    "platform": "linux",
+    "logo": "https://portainer.io/images/logos/portainer.png",
+    "repository": {
+      "url": "https://github.com/portainer/templates",
+      "stackfile": "stacks/portainer-agent/docker-stack.yml"
+    }
+  },
   {
     "type": "stack",
     "title": "OpenFaaS",
@@ -718,8 +731,8 @@
     "platform": "linux",
     "logo": "https://portainer.io/images/logos/ironfunctions.png",
     "repository": {
-      "url": "https://github.com/deviantony/ironfunctions_stack",
-      "stackfile": "docker-stack.yml"
+      "url": "https://github.com/portainer/templates",
+      "stackfile": "stacks/ironfunctions/docker-stack.yml"
     }
   },
   {