diff --git a/server/modules/analytics/umami/definition.yml b/server/modules/analytics/umami/definition.yml
index 8afec209..3d718cc6 100644
--- a/server/modules/analytics/umami/definition.yml
+++ b/server/modules/analytics/umami/definition.yml
@@ -1,5 +1,5 @@
 key: umami
-title: Umami Analytics
+title: Umami Analytics v1
 description: Umami is a simple, fast, privacy-focused alternative to Google Analytics.
 author: CDN18
 logo: https://static.requarks.io/logo/umami.svg
diff --git a/server/modules/analytics/umami2/code.yml b/server/modules/analytics/umami2/code.yml
new file mode 100644
index 00000000..1a9310b6
--- /dev/null
+++ b/server/modules/analytics/umami2/code.yml
@@ -0,0 +1,2 @@
+head: |
+  <script async src="{{url}}/script.js" data-website-id="{{websiteID}}"></script>
diff --git a/server/modules/analytics/umami2/definition.yml b/server/modules/analytics/umami2/definition.yml
new file mode 100644
index 00000000..49336a63
--- /dev/null
+++ b/server/modules/analytics/umami2/definition.yml
@@ -0,0 +1,17 @@
+key: umami2
+title: Umami Analytics v2
+description: Umami is a simple, fast, privacy-focused alternative to Google Analytics.
+author: CDN18
+logo: https://static.requarks.io/logo/umami.svg
+website: https://umami.is
+isAvailable: true
+props:
+  websiteID:
+    type: String
+    title: Website ID
+    order: 1
+  url:
+    type: String
+    title: Umami Server URL
+    hint: The URL of your Umami instance. It should start with http/https and omit the trailing slash. (e.g. https://umami.example.com)
+    order: 2