diff --git a/ansible/roles/common_deb/tasks/main.yml b/ansible/roles/common_deb/tasks/main.yml
index bb08d8005c583df0437bef37ef4ca73a2e738b50..4d6ef7b5e7a6fecb642af16aa0686720f1b43bc2 100644
--- a/ansible/roles/common_deb/tasks/main.yml
+++ b/ansible/roles/common_deb/tasks/main.yml
@@ -362,8 +362,8 @@
         groups: ["systemd-journal"]
 
     - name: "Journal checker"
-      copy:
-        src: "../bin/{{item}}"
+      template:
+        src: "{{item}}.j2"
         dest: "/usr/bin/{{item}}"
         mode: "u=rx,g=rx,o=rx"
       loop:
diff --git a/bin/dfwatch b/ansible/roles/common_deb/templates/dfwatch.j2
similarity index 89%
rename from bin/dfwatch
rename to ansible/roles/common_deb/templates/dfwatch.j2
index 2b51e0463a90b10b7a85c8897241b71be81eeecb..f44fec95ba4c36b9f91da6ffbd194c264756878d 100755
--- a/bin/dfwatch
+++ b/ansible/roles/common_deb/templates/dfwatch.j2
@@ -3,6 +3,7 @@
 DFFILT="-x tmpfs -x devtmpfs -l"
 FSFILT='\(/mnt/xstill\)'
 MAIL=mail
+MAIL_TO={{admin_email}}
 if ! which $MAIL >&/dev/null; then
     MAIL=bsd-mailx
 fi
@@ -30,6 +31,6 @@ FULL=$(df --output=pcent,avail,target,size $DFFILT | tail -n+2 | sed -e 's/^[ ]*
 done)
 
 if test -n "$FULL"; then
-    df -h $DFFILT | $MAIL -s "[DF:$(hostname)] Full: $FULL" xstill@fi.muni.cz
+    df -h $DFFILT | $MAIL -s "[DF:$(hostname)] Full: $FULL" ${MAIL_TO}
     exit 1
 fi
diff --git a/bin/journal-checker b/ansible/roles/common_deb/templates/journal-checker.j2
similarity index 100%
rename from bin/journal-checker
rename to ansible/roles/common_deb/templates/journal-checker.j2