diff --git a/blueprints/mediafetch/docker-compose.yml b/blueprints/mediafetch/docker-compose.yml
new file mode 100644
index 000000000..f0c690cd1
--- /dev/null
+++ b/blueprints/mediafetch/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "3.8"
+services:
+  mediafetch:
+    image: lukedunsmoto/mediafetch:latest
+    restart: unless-stopped
+    expose:
+      - "3002"
+    volumes:
+      - mediafetch_data:/data/downloads
+    environment:
+      - PORT=3002
+      - BASIC_AUTH_USER=${BASIC_AUTH_USER}
+      - BASIC_AUTH_PASS=${BASIC_AUTH_PASS}
+      - PUBLIC_BASE_URL=https://${DOMAIN}
+      - OUTPUT_DIR=/data/downloads
+
+volumes:
+  mediafetch_data:
\ No newline at end of file
diff --git a/blueprints/mediafetch/mediafetch.svg b/blueprints/mediafetch/mediafetch.svg
new file mode 100644
index 000000000..e11cedb76
--- /dev/null
+++ b/blueprints/mediafetch/mediafetch.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="67eb27e2ce"><path d="M 220 32.042969 L 267 32.042969 L 267 78 L 220 78 Z M 220 32.042969 " clip-rule="nonzero"/></clipPath><clipPath id="6f581397bb"><path d="M 15.800781 16.324219 L 359.488281 16.324219 L 359.488281 358.675781 L 15.800781 358.675781 Z M 15.800781 16.324219 " clip-rule="nonzero"/></clipPath><clipPath id="fafbf149ff"><path d="M 33.050781 16.324219 L 341.949219 16.324219 C 346.523438 16.324219 350.914062 18.140625 354.148438 21.375 C 357.382812 24.609375 359.199219 29 359.199219 33.574219 L 359.199219 341.425781 C 359.199219 346 357.382812 350.390625 354.148438 353.625 C 350.914062 356.859375 346.523438 358.675781 341.949219 358.675781 L 33.050781 358.675781 C 28.476562 358.675781 24.085938 356.859375 20.851562 353.625 C 17.617188 350.390625 15.800781 346 15.800781 341.425781 L 15.800781 33.574219 C 15.800781 29 17.617188 24.609375 20.851562 21.375 C 24.085938 18.140625 28.476562 16.324219 33.050781 16.324219 Z M 33.050781 16.324219 " clip-rule="nonzero"/></clipPath><clipPath id="e7fe71e770"><path d="M 0.800781 0.324219 L 344.28125 0.324219 L 344.28125 342.675781 L 0.800781 342.675781 Z M 0.800781 0.324219 " clip-rule="nonzero"/></clipPath><clipPath id="eaa8183f7a"><path d="M 18.050781 0.324219 L 326.949219 0.324219 C 331.523438 0.324219 335.914062 2.140625 339.148438 5.375 C 342.382812 8.609375 344.199219 13 344.199219 17.574219 L 344.199219 325.425781 C 344.199219 330 342.382812 334.390625 339.148438 337.625 C 335.914062 340.859375 331.523438 342.675781 326.949219 342.675781 L 18.050781 342.675781 C 13.476562 342.675781 9.085938 340.859375 5.851562 337.625 C 2.617188 334.390625 0.800781 330 0.800781 325.425781 L 0.800781 17.574219 C 0.800781 13 2.617188 8.609375 5.851562 5.375 C 9.085938 2.140625 13.476562 0.324219 18.050781 0.324219 Z M 18.050781 0.324219 " clip-rule="nonzero"/></clipPath><clipPath id="50f6d46733"><rect x="0" width="345" y="0" height="343"/></clipPath><clipPath id="c08bfc6de3"><path d="M 220 32.042969 L 267 32.042969 L 267 78 L 220 78 Z M 220 32.042969 " clip-rule="nonzero"/></clipPath></defs><path fill="#4f46e5" d="M 200.304688 342.957031 C 196.074219 342.957031 191.816406 342.421875 187.515625 341.351562 C 174.527344 338.105469 161.890625 330.898438 149.386719 321.617188 C 159.539062 322.742188 170.023438 323.117188 180.476562 323.117188 C 185.476562 323.117188 190.472656 323.027344 195.421875 322.898438 C 216.023438 321.902344 235.824219 320.144531 252.621094 314.84375 C 252.449219 315.027344 252.28125 315.207031 252.113281 315.390625 C 235 333.683594 217.917969 342.957031 200.304688 342.957031 M 74.6875 240.597656 C 73.570312 238.351562 72.542969 236.082031 71.613281 233.789062 C 61.804688 209.628906 66.976562 185.964844 88.199219 163.28125 C 92.429688 158.730469 97.328125 154.222656 102.804688 149.847656 C 85.484375 180.59375 75.996094 213.664062 74.6875 240.597656 M 297.707031 236.515625 C 295.4375 206.988281 284.648438 169.792969 264.847656 137.0625 C 257.097656 124.25 248.457031 113.371094 239.21875 104.789062 C 258.796875 106.464844 275.300781 112.757812 286.832031 123.703125 C 308.058594 142.964844 313.226562 177.25 303.417969 217.101562 C 301.796875 223.691406 299.875 230.179688 297.707031 236.515625 " fill-opacity="1" fill-rule="nonzero"/><path fill="#3bf4fb" d="M 149.386719 321.617188 C 136.367188 320.171875 123.894531 317.492188 112.734375 312.777344 C 88.71875 302.625 75.636719 282.238281 74.605469 251.1875 C 74.480469 247.785156 74.511719 244.246094 74.6875 240.597656 C 85.355469 262.066406 104.160156 281.613281 122.921875 299.414062 C 131.726562 307.410156 140.523438 315.03125 149.386719 321.617188 M 252.621094 314.84375 C 269.746094 296.238281 286.855469 268.210938 297.707031 236.515625 C 297.875 238.667969 297.992188 240.777344 298.066406 242.84375 C 299.097656 273.894531 290.363281 295.097656 270.746094 306.875 C 265.246094 310.179688 259.164062 312.78125 252.621094 314.84375 M 102.804688 149.847656 C 104.101562 147.535156 105.445312 145.242188 106.835938 142.960938 C 129.222656 106.21875 158.511719 83.492188 187.074219 82.75 C 187.984375 82.703125 188.894531 82.679688 189.800781 82.679688 C 207.042969 82.679688 223.949219 90.597656 239.21875 104.789062 C 235.65625 104.480469 231.988281 104.328125 228.230469 104.328125 C 215.542969 104.328125 201.824219 106.070312 187.515625 109.546875 C 154.238281 117.621094 124.148438 132.765625 102.804688 149.847656 " fill-opacity="1" fill-rule="nonzero"/><path fill="#4338ca" d="M 180.476562 323.117188 C 170.023438 323.117188 159.539062 322.742188 149.386719 321.617188 C 140.523438 315.03125 131.726562 307.410156 122.921875 299.414062 C 104.160156 281.613281 85.355469 262.066406 74.6875 240.597656 C 75.996094 213.664062 85.484375 180.59375 102.804688 149.847656 C 124.148438 132.765625 154.238281 117.621094 187.515625 109.546875 C 201.824219 106.070312 215.542969 104.328125 228.230469 104.328125 C 231.988281 104.328125 235.65625 104.480469 239.21875 104.789062 C 248.457031 113.371094 257.097656 124.25 264.847656 137.0625 C 284.648438 169.792969 295.4375 206.988281 297.707031 236.515625 C 286.855469 268.210938 269.746094 296.238281 252.621094 314.84375 C 235.824219 320.144531 216.023438 321.902344 195.421875 322.898438 C 190.472656 323.027344 185.476562 323.117188 180.476562 323.117188 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#67eb27e2ce)"><path fill="#4f46e5" d="M 243.421875 77.96875 C 230.738281 77.96875 220.457031 67.6875 220.457031 55.003906 C 220.457031 42.320312 230.738281 32.039062 243.421875 32.039062 C 256.105469 32.039062 266.386719 42.320312 266.386719 55.003906 C 266.386719 67.6875 256.105469 77.96875 243.421875 77.96875 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#3bf4fb" d="M 289.351562 112.804688 C 283.007812 112.804688 277.871094 107.664062 277.871094 101.320312 C 277.871094 94.980469 283.007812 89.84375 289.351562 89.84375 C 295.691406 89.84375 300.832031 94.980469 300.832031 101.320312 C 300.832031 107.664062 295.691406 112.804688 289.351562 112.804688 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 257.734375 197.097656 L 160.519531 140.96875 C 148.984375 134.308594 134.566406 142.632812 134.566406 155.953125 L 134.566406 268.210938 C 134.566406 281.527344 148.984375 289.851562 160.519531 283.195312 L 257.734375 227.066406 C 269.273438 220.40625 269.273438 203.753906 257.734375 197.097656 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#6f581397bb)"><g clip-path="url(#fafbf149ff)"><g transform="matrix(1, 0, 0, 1, 15, 16)"><g clip-path="url(#50f6d46733)"><g clip-path="url(#e7fe71e770)"><g clip-path="url(#eaa8183f7a)"><path fill="#152039" d="M 0.800781 0.324219 L 344.488281 0.324219 L 344.488281 342.675781 L 0.800781 342.675781 Z M 0.800781 0.324219 " fill-opacity="1" fill-rule="nonzero"/></g></g></g></g></g></g><path fill="#4f46e5" d="M 200.304688 342.957031 C 196.074219 342.957031 191.816406 342.421875 187.515625 341.351562 C 174.527344 338.105469 161.890625 330.898438 149.386719 321.617188 C 159.539062 322.742188 170.023438 323.117188 180.476562 323.117188 C 185.476562 323.117188 190.472656 323.027344 195.421875 322.898438 C 216.023438 321.902344 235.824219 320.144531 252.621094 314.84375 C 252.449219 315.027344 252.28125 315.207031 252.113281 315.390625 C 235 333.683594 217.917969 342.957031 200.304688 342.957031 M 74.6875 240.597656 C 73.570312 238.351562 72.542969 236.082031 71.613281 233.789062 C 61.804688 209.628906 66.976562 185.964844 88.199219 163.28125 C 92.429688 158.730469 97.328125 154.222656 102.804688 149.847656 C 85.484375 180.59375 75.996094 213.664062 74.6875 240.597656 M 297.707031 236.515625 C 295.4375 206.988281 284.648438 169.792969 264.847656 137.0625 C 257.097656 124.25 248.457031 113.371094 239.21875 104.789062 C 258.796875 106.464844 275.300781 112.757812 286.832031 123.703125 C 308.058594 142.964844 313.226562 177.25 303.417969 217.101562 C 301.796875 223.691406 299.875 230.179688 297.707031 236.515625 " fill-opacity="1" fill-rule="nonzero"/><path fill="#3bf4fb" d="M 149.386719 321.617188 C 136.367188 320.171875 123.894531 317.492188 112.734375 312.777344 C 88.71875 302.625 75.636719 282.238281 74.605469 251.1875 C 74.480469 247.785156 74.511719 244.246094 74.6875 240.597656 C 85.355469 262.066406 104.160156 281.613281 122.921875 299.414062 C 131.726562 307.410156 140.523438 315.03125 149.386719 321.617188 M 252.621094 314.84375 C 269.746094 296.238281 286.855469 268.210938 297.707031 236.515625 C 297.875 238.667969 297.992188 240.777344 298.066406 242.84375 C 299.097656 273.894531 290.363281 295.097656 270.746094 306.875 C 265.246094 310.179688 259.164062 312.78125 252.621094 314.84375 M 102.804688 149.847656 C 104.101562 147.535156 105.445312 145.242188 106.835938 142.960938 C 129.222656 106.21875 158.511719 83.492188 187.074219 82.75 C 187.984375 82.703125 188.894531 82.679688 189.800781 82.679688 C 207.042969 82.679688 223.949219 90.597656 239.21875 104.789062 C 235.65625 104.480469 231.988281 104.328125 228.230469 104.328125 C 215.542969 104.328125 201.824219 106.070312 187.515625 109.546875 C 154.238281 117.621094 124.148438 132.765625 102.804688 149.847656 " fill-opacity="1" fill-rule="nonzero"/><path fill="#4338ca" d="M 180.476562 323.117188 C 170.023438 323.117188 159.539062 322.742188 149.386719 321.617188 C 140.523438 315.03125 131.726562 307.410156 122.921875 299.414062 C 104.160156 281.613281 85.355469 262.066406 74.6875 240.597656 C 75.996094 213.664062 85.484375 180.59375 102.804688 149.847656 C 124.148438 132.765625 154.238281 117.621094 187.515625 109.546875 C 201.824219 106.070312 215.542969 104.328125 228.230469 104.328125 C 231.988281 104.328125 235.65625 104.480469 239.21875 104.789062 C 248.457031 113.371094 257.097656 124.25 264.847656 137.0625 C 284.648438 169.792969 295.4375 206.988281 297.707031 236.515625 C 286.855469 268.210938 269.746094 296.238281 252.621094 314.84375 C 235.824219 320.144531 216.023438 321.902344 195.421875 322.898438 C 190.472656 323.027344 185.476562 323.117188 180.476562 323.117188 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#c08bfc6de3)"><path fill="#4f46e5" d="M 243.421875 77.96875 C 230.738281 77.96875 220.457031 67.6875 220.457031 55.003906 C 220.457031 42.320312 230.738281 32.039062 243.421875 32.039062 C 256.105469 32.039062 266.386719 42.320312 266.386719 55.003906 C 266.386719 67.6875 256.105469 77.96875 243.421875 77.96875 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#3bf4fb" d="M 289.351562 112.804688 C 283.007812 112.804688 277.871094 107.664062 277.871094 101.320312 C 277.871094 94.980469 283.007812 89.84375 289.351562 89.84375 C 295.691406 89.84375 300.832031 94.980469 300.832031 101.320312 C 300.832031 107.664062 295.691406 112.804688 289.351562 112.804688 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 257.734375 197.097656 L 160.519531 140.96875 C 148.984375 134.308594 134.566406 142.632812 134.566406 155.953125 L 134.566406 268.210938 C 134.566406 281.527344 148.984375 289.851562 160.519531 283.195312 L 257.734375 227.066406 C 269.273438 220.40625 269.273438 203.753906 257.734375 197.097656 " fill-opacity="1" fill-rule="nonzero"/></svg>
\ No newline at end of file
diff --git a/blueprints/mediafetch/template.toml b/blueprints/mediafetch/template.toml
new file mode 100644
index 000000000..07672d4ec
--- /dev/null
+++ b/blueprints/mediafetch/template.toml
@@ -0,0 +1,15 @@
+[variables]
+BASIC_AUTH_USER = "admin"
+BASIC_AUTH_PASS = "${password:12}"
+
+[config]
+[[config.domains]]
+name = "Domain"
+variable = "DOMAIN"
+serviceName = "mediafetch"
+port = 3002
+
+[[config.mounts]]
+name = "Downloads"
+filePath = "/data/downloads"
+content = "mediafetch"
\ No newline at end of file
diff --git a/meta.json b/meta.json
index 7e59e5a01..39ee1c001 100644
--- a/meta.json
+++ b/meta.json
@@ -3894,6 +3894,23 @@
       "self-hosted"
     ]
   },
+  {
+    "id": "mediafetch",
+    "name": "MediaFetch",
+    "version": "1.1.1",
+    "description": "A tiny, self-hosted web wrapper for yt-dlp to download video and audio. Optional basic auth.",
+    "logo": "mediafetch.svg",
+    "links": {
+      "github": "https://github.com/lukedunsmoto/mediafetch",
+      "website": "https://www.lukedunsmore.com/mediafetch",
+      "docs": "https://docs.lukedunsmore.com/docs/self-hosted/mediafetch/"
+    },
+    "tags": [
+      "utilities",
+      "media",
+      "downloader"
+    ]
+  },
   {
     "id": "meilisearch",
     "name": "Meilisearch",