diff --git a/nomad-job/crowdsec-agent.nomad b/nomad-job/crowdsec-agent.nomad
index d1519c6..a4353dc 100644
--- a/nomad-job/crowdsec-agent.nomad
+++ b/nomad-job/crowdsec-agent.nomad
@@ -37,13 +37,37 @@ job "crowdsec-agent" {
 
       }
       env {
-        COLLECTIONS       = "crowdsecurity/traefik crowdsecurity/home-assistant LePresidente/gitea"
-        DISABLE_LOCAL_API = "true"
+      COLLECTIONS       = "andreasbrett/paperless-ngx Dominic-Wagner/vaultwarden LePresidente/jellyfin crowdsecurity/traefik crowdsecurity/home-assistant LePresidente/gitea crowdsecurity/postfix  crowdsecurity/dovecot "
+      DISABLE_LOCAL_API = "true"
       }
       template {
         data        = <<EOH
 ---
 source: docker
+container_name_regexp:
+  - jellyfin*
+labels:
+  type: jellyfin
+---
+source: docker
+container_name_regexp:
+  - paperless-ng*
+labels:
+  type: Paperless-ngx
+---
+source: docker
+container_name_regexp:
+  - vaultwarden*
+labels:
+  type: Vaultwarden
+---
+source: docker
+container_name_regexp:
+  - docker-mailserver*
+labels:
+  type: syslog
+---
+source: docker
 container_name_regexp:
   - traefik-*
 labels:
diff --git a/nomad-job/dockermailserver.nomad b/nomad-job/dockermailserver.nomad
index 95333f4..da53da6 100644
--- a/nomad-job/dockermailserver.nomad
+++ b/nomad-job/dockermailserver.nomad
@@ -112,7 +112,7 @@ job "dockermailserver" {
     #      policies= ["policy_name"]
     #
     #}
-    task "server" {
+    task "docker-mailserver" {
       driver = "docker"
       config {
         image = "ghcr.io/docker-mailserver/docker-mailserver:edge"