diff --git a/apps/gotify/config.json b/apps/gotify/config.json
new file mode 100644
index 00000000..529b0c88
--- /dev/null
+++ b/apps/gotify/config.json
@@ -0,0 +1,33 @@
+{
+  "$schema": "../schema.json",
+  "name": "Gotify",
+  "available": true,
+  "port": 8129,
+  "id": "gotify",
+  "tipi_version": 2,
+  "version": "2.1.7",
+  "categories": ["utilities"],
+  "description": "Simple server for sending and receiving notification messages.",
+  "short_desc": "Gotify, a simple server for sending and receiving notification messages.",
+  "author": "gotigy",
+  "source": "https://github.com/gotify/server",
+  "website": "https://gotify.net",
+  "form_fields": [
+    {
+      "type": "text",
+        "label": "Traefik Domain",
+        "max": 50,
+        "min": 3,
+        "required": false,
+        "env_variable": "TRAEFIK_GOTIFY"
+    }, 
+    {
+      "type": "password",
+      "label": "Password",
+      "max": 50,
+      "min": 3,
+      "required": true,
+      "env_variable": "GOTIFY_DEFAULTUSER_PASS"
+  }
+  ]
+}
diff --git a/apps/gotify/docker-compose.yml b/apps/gotify/docker-compose.yml
new file mode 100644
index 00000000..38dd1e79
--- /dev/null
+++ b/apps/gotify/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3.7"
+services:
+  gotify:
+    image: gotify/server:2.1.7
+    container_name: gotify
+    restart: unless-stopped
+    volumes:
+      - "${APP_DATA_DIR}/datagit :/app/data"
+    environment:
+      - GOTIFY_DEFAULTUSER_PASS=${GOTIFY_DEFAULTUSER_PASS}
+    ports:
+      - ${APP_PORT}:80
+    networks:
+      - tipi_main_network
diff --git a/apps/gotify/metadata/description.md b/apps/gotify/metadata/description.md
new file mode 100644
index 00000000..330f14d3
--- /dev/null
+++ b/apps/gotify/metadata/description.md
@@ -0,0 +1,10 @@
+# Selfhosted notification service
+
+We wanted a simple server for sending and receiving messages (in real time per WebSocket). For this, not many open source projects existed and most of the existing ones were abandoned. Also, a requirement was that it can be self-hosted. We know there are many free and commercial push services out there.
+
+At the heart of this project. (gotify/server)[https://hub.docker.com/r/gotify/server] features a WebUI and functionality for:
+
+-   sending messages via a REST-API
+-   subscribing/receiving messages via a web socket connection
+-   managing users, clients and applications
+
diff --git a/apps/gotify/metadata/logo.jpg b/apps/gotify/metadata/logo.jpg
new file mode 100644
index 00000000..45e1ba21
Binary files /dev/null and b/apps/gotify/metadata/logo.jpg differ