diff --git a/servapps/Unifi-Controller/cosmos-compose.json b/servapps/Unifi-Controller/cosmos-compose.json
new file mode 100644
index 00000000..24d39887
--- /dev/null
+++ b/servapps/Unifi-Controller/cosmos-compose.json
@@ -0,0 +1,61 @@
+{
+    "cosmos-installer": {
+       "post-install": [
+          {
+             "type": "warning",
+             "label": "Read the GitHub Page for info about adopting devices and other stuff: https://github.com/jacobalberty/unifi-docker/#adopting-access-points-and-unifi-devices."
+          }
+        ]
+    },
+    "services": {
+       "{ServiceName}": {
+          "image": "jacobalberty/unifi",
+          "container_name": "{ServiceName}",
+          "restart": "unless-stopped",
+          "ports": [
+             "3478:3478/udp",
+             "6789:6789",
+             "8443:8443",
+             "8080:8080",
+             "8880:8880",
+             "8843:8843",
+             "10001:10001/udp"
+              
+          ],
+          "environment": [
+             "TZ=auto"
+          ],
+          "volumes": [
+             {
+                "source": "{ServiceName}-unifi",
+                "target": "/unifi",
+                "type": "volume"
+             }
+          ],
+          "user": "unifi",
+          "init": true,
+          "routes": [
+             {
+                "name": "{ServiceName}",
+                "description": "Expose {ServiceName} to the web",
+                "useHost": true,
+                "target": "https://{ServiceName}:8443",
+                "mode": "SERVAPP",
+                "Timeout": 14400000,
+                "ThrottlePerMinute": 12000,
+                "AcceptInsecureHTTPSTarget": true,
+                "BlockCommonBots": true,
+                "SmartShield": {
+                   "Enabled": true
+                }
+             }
+          ],
+          "labels": {
+             "cosmos-force-network-secured": "false",
+             "cosmos-auto-update": "true",
+             "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/Unify-Controller/icon.png",
+             "cosmos-persistent-env": "TZ"
+          }
+       }
+    }
+ }
diff --git a/servapps/Unifi-Controller/description.json b/servapps/Unifi-Controller/description.json
new file mode 100644
index 00000000..69c09008
--- /dev/null
+++ b/servapps/Unifi-Controller/description.json
@@ -0,0 +1,9 @@
+{
+    "name": "Unifi Controller",
+    "longDescription": "Unifi Controller is a management software designed for Ubiquiti Networks hardware, providing centralized management of Ubiquiti devices. It allows users to configure, monitor, and manage networks of Ubiquiti devices, including access points, switches, and security gateways. The Controller offers features like analytics, guest portal, firmware updates, and network mapping.",
+    "description": "Unifi Controller is a management software for Ubiquiti Networks hardware, enabling centralized device management.",
+    "tags": ["network management", "Ubiquiti Networks", "hardware", "management software"],
+    "repository": "https://github.com/jacobalberty/unifi-docker",
+    "image": "https://hub.docker.com/r/jacobalberty/unifi",
+    "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/Unifi-Controller/icon.png b/servapps/Unifi-Controller/icon.png
new file mode 100644
index 00000000..ff65cc40
Binary files /dev/null and b/servapps/Unifi-Controller/icon.png differ
diff --git a/servapps/Unifi-Controller/screenshots/1.png b/servapps/Unifi-Controller/screenshots/1.png
new file mode 100644
index 00000000..626a9f06
Binary files /dev/null and b/servapps/Unifi-Controller/screenshots/1.png differ
diff --git a/servapps/Unifi-Controller/screenshots/2.png b/servapps/Unifi-Controller/screenshots/2.png
new file mode 100644
index 00000000..dc8741ee
Binary files /dev/null and b/servapps/Unifi-Controller/screenshots/2.png differ
diff --git a/servapps/Unifi-Controller/screenshots/3.png b/servapps/Unifi-Controller/screenshots/3.png
new file mode 100644
index 00000000..1d7dd805
Binary files /dev/null and b/servapps/Unifi-Controller/screenshots/3.png differ
diff --git a/servapps/Unifi-Controller/screenshots/4.png b/servapps/Unifi-Controller/screenshots/4.png
new file mode 100644
index 00000000..c79680d0
Binary files /dev/null and b/servapps/Unifi-Controller/screenshots/4.png differ