diff --git a/templates.json b/templates.json
index dfca3c9c..d8b8bcc4 100644
--- a/templates.json
+++ b/templates.json
@@ -1456,6 +1456,48 @@
           ]
         }
       ]
+    },
+    {
+      "id": 67,
+      "type": 3,
+      "title": "Timescale DB",
+      "description": "Open-source time series database developed by Timescale Inc",
+      "categories": ["edge"],
+      "platform": "linux",
+      "logo": "https://pbs.twimg.com/profile_images/1658849767865167876/hA5OXD9m_400x400.jpg",
+      "repository": {
+        "url": "https://github.com/portainer/templates",
+        "stackfile": "edge/timescaledb/docker-compose.yml"
+      },
+      "env": [
+        {
+          "name": "pgpassword",
+          "label": "Database root password"
+        }
+      ]
+    },
+    {
+      "id": 68,
+      "type": 3,
+      "title": "Apache NIFI",
+      "description": "Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data - Single Server Deployment",
+      "categories": ["edge"],
+      "platform": "linux",
+      "logo": "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQRyUilErsgYYtwSYrOY90H723YlVXcUQXuRw&usqp=CAU",
+      "repository": {
+        "url": "https://github.com/portainer/templates",
+        "stackfile": "edge/apachenifi/docker-compose.yml"
+      },
+      "env": [
+        {
+          "name": "nifiusername",
+          "label": "Nifi UI admin username"
+        },
+        {
+          "name": "nifipassword",
+          "label": "Nifi UI admin password (12+ Characters)"
+        }
+      ]
     }
   ]
 }