diff --git a/apps/transmission-vpn/config.json b/apps/transmission-vpn/config.json
index 8af5ffe5..a9532f72 100644
--- a/apps/transmission-vpn/config.json
+++ b/apps/transmission-vpn/config.json
@@ -11,7 +11,7 @@
   },
   "id": "transmission-vpn",
   "tipi_version": 3,
-  "version": "5.1.1@sha256:c5a66e4c9df0b326310b81cfcd7fa1c0cd61ebeaf60b4651188c94b8afde3aca",
+  "version": "5.1.1",
   "categories": [
     "utilities",
     "security"
diff --git a/apps/transmission-vpn/docker-compose.yml b/apps/transmission-vpn/docker-compose.yml
index e438f9b8..b7c38ae4 100644
--- a/apps/transmission-vpn/docker-compose.yml
+++ b/apps/transmission-vpn/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   transmission-vpn:
-    image: haugene/transmission-openvpn:5.1.1@sha256:c5a66e4c9df0b326310b81cfcd7fa1c0cd61ebeaf60b4651188c94b8afde3aca
+    image: haugene/transmission-openvpn:5.1.1
     container_name: transmission-vpn
     cap_add:
       - NET_ADMIN
diff --git a/apps/unmanic/config.json b/apps/unmanic/config.json
new file mode 100644
index 00000000..c214d555
--- /dev/null
+++ b/apps/unmanic/config.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "../schema.json",
+  "name": "Unmanic",
+  "port": 8256,
+  "available": true,
+  "exposable": true,
+  "id": "unmanic",
+  "tipi_version": 1,
+  "version": "0.2.4",
+  "categories": [
+    "utilities",
+    "data",
+    "media"
+  ],
+  "description": "Unmanic gives you the power to automate the management of any file library.",
+  "short_desc": "Unmanic - Library Optimiser.",
+  "author": "Unmanic",
+  "source": "https://github.com/Unmanic/unmanic",
+  "website": "https://docs.unmanic.app/",
+  "form_fields": []
+}
diff --git a/apps/unmanic/docker-compose.yml b/apps/unmanic/docker-compose.yml
new file mode 100644
index 00000000..a4abb4dc
--- /dev/null
+++ b/apps/unmanic/docker-compose.yml
@@ -0,0 +1,43 @@
+version: "3.5"
+services:
+  unmanic:
+    image: josh5/unmanic:0.2.4
+    restart: unless-stopped
+    container_name: unmanic
+    privileged: true
+    ports:
+      - ${APP_PORT}:8888
+    networks:
+      - tipi_main_network
+    environment:
+        - PUID=${TIPI_UID}
+        - PGID=${TIPI_GID}
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+      - ${ROOT_FOLDER_HOST}/data:/library
+      - ${APP_DATA_DIR}/data/temp:/tmp/unmanic
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.unmanic-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.unmanic.loadbalancer.server.port: 8888
+      # Web
+      traefik.http.routers.unmanic-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.unmanic-insecure.entrypoints: web
+      traefik.http.routers.unmanic-insecure.service: unmanic
+      traefik.http.routers.unmanic-insecure.middlewares: unmanic-web-redirect
+      # Websecure
+      traefik.http.routers.unmanic.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.unmanic.entrypoints: websecure
+      traefik.http.routers.unmanic.service: unmanic
+      traefik.http.routers.unmanic.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.unmanic-local-insecure.rule: Host(`unmanic.${LOCAL_DOMAIN}`)
+      traefik.http.routers.unmanic-local-insecure.entrypoints: web
+      traefik.http.routers.unmanic-local-insecure.service: unmanic
+      traefik.http.routers.unmanic-local-insecure.middlewares: unmanic-web-redirect
+      # Local domain secure
+      traefik.http.routers.unmanic-local.rule: Host(`unmanic.${LOCAL_DOMAIN}`)
+      traefik.http.routers.unmanic-local.entrypoints: websecure
+      traefik.http.routers.unmanic-local.service: unmanic
+      traefik.http.routers.unmanic-local.tls: true
diff --git a/apps/unmanic/metadata/description.md b/apps/unmanic/metadata/description.md
new file mode 100644
index 00000000..2127f155
--- /dev/null
+++ b/apps/unmanic/metadata/description.md
@@ -0,0 +1,30 @@
+Unmanic - Library Optimiser  
+===========================
+
+![UNMANIC - Library Optimiser](https://github.com/unmanic/unmanic/raw/master/logo.png)
+
+---
+
+Unmanic is a simple tool for optimising your file library. You can use it to convert your files into a single, uniform format, manage file movements based on timestamps, or execute custom commands against a file based on its file size.
+
+Simply configure Unmanic pointing it at your library and let it automatically manage that library for you.
+
+Unmanic provides you with the following main functions:
+
+- A scheduler built in to scan your whole library for files that do not conform to your configured file presets. Files found requiring processing are then queued.
+- A file/directory monitor. When a file is modified, or a new file is added in your library, Unmanic is able to again test that against your configured file presets. Like the first function, if this file requires processing, it is added to a queue for processing.
+- A handler to manage running multiple file manipulation tasks at a time.
+- A Web UI to easily configure, manage and monitor the progress of your library optimisation.
+
+You choose how you want your library to be.
+
+Some examples of how you may use Unmanic:
+
+- Trans-code video or audio files into a uniform format using FFmpeg.
+- Identify (and remove if desired) commercials in DVR recordings shortly after they have completed being recorded.
+- Move files from one location to another after a configured period of time.
+- Automatically execute FileBot rename files in your library as they are added.
+- Compress files older than a specified age.
+- Run any custom command against files matching a certain extension or above a configured file size.
+
+The Docker container is currently based `linuxserver.io` Ubuntu focal image.
\ No newline at end of file
diff --git a/apps/unmanic/metadata/logo.jpg b/apps/unmanic/metadata/logo.jpg
new file mode 100644
index 00000000..f6d3f4b6
Binary files /dev/null and b/apps/unmanic/metadata/logo.jpg differ