diff --git a/roles/ampache/defaults/main.yml b/roles/ampache/defaults/main.yml
index b688961..ded7bd1 100644
--- a/roles/ampache/defaults/main.yml
+++ b/roles/ampache/defaults/main.yml
@@ -3,10 +3,10 @@
 ampache_id: "1"
 ampache_manage_upgrade: True
 
-ampache_version: '5.4.0'
-ampache_config_version: 61
+ampache_version: '5.4.1'
+ampache_config_version: 62
 ampache_zip_url: https://github.com/ampache/ampache/releases/download/{{ ampache_version }}/ampache-{{ ampache_version }}_all.zip
-ampache_zip_sha256: 40956c9818f691f70e9fa49b9ed08539addb8198dbc13dbae9403c59ca42a731
+ampache_zip_sha256: 867a87d73a16386ff95d9b6474828917f9b03c23ec49d8f22c09ccbad987eb7b
 
 ampache_root_dir: /opt/ampache_{{ ampache_id }}
 
diff --git a/roles/consul/templates/consul.service.j2 b/roles/consul/templates/consul.service.j2
index 8b5a2bc..6f7d73d 100644
--- a/roles/consul/templates/consul.service.j2
+++ b/roles/consul/templates/consul.service.j2
@@ -11,8 +11,7 @@ User={{ consul_user }}
 Group={{ consul_user }}
 ExecStart={{ consul_root_dir }}/bin/consul agent -config-file={{ consul_root_dir }}/etc/consul.hcl
 ExecReload=/bin/kill --signal HUP $MAINPID
-KillMode=process
-KillSignal=SIGTERM
+SuccessExitStatus=1
 Restart=on-failure
 RestartSec=2
 LimitNOFILE=65536
diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml
index b696187..85186f0 100644
--- a/roles/kimai/defaults/main.yml
+++ b/roles/kimai/defaults/main.yml
@@ -5,12 +5,12 @@
 # You can set it to a number or a simple string (no special chars)
 kimai_id: 1
 # Kimai version to deploy
-kimai_version: '1.21.0'
+kimai_version: '1.22.0'
 
 # URL of the archive
 kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
 # Expected sha256 of the archive
-kimai_archive_sha256: d65402baf3efef18780d8a4a4d54e1a23b30f3137724828f116bcc57f04686f1
+kimai_archive_sha256: 64db4ab885ad5df0dd28a54235a344179872b95e096c6418b55a42c14e06c236
 
 # Directory where kimai will be installed
 kimai_root_dir: /opt/kimai_{{ kimai_id }}
@@ -21,7 +21,7 @@ kimai_manage_upgrade: True
 # Will be created
 kimai_php_user: php-kimai_{{ kimai_id }}
 # PHP version under which kimai will run
-kimai_php_version: 80
+kimai_php_version: 81
 # Or you can specify here the name of a custom PHP FPM pool. See the httpd_php role
 # bookstack_php_fpm_pool: custom_kimai
 
diff --git a/roles/nomad/templates/nomad.service.j2 b/roles/nomad/templates/nomad.service.j2
index 8cd1eb8..222ba8f 100644
--- a/roles/nomad/templates/nomad.service.j2
+++ b/roles/nomad/templates/nomad.service.j2
@@ -11,8 +11,7 @@ User={{ nomad_user }}
 Group={{ nomad_user }}
 ExecStart={{ nomad_root_dir }}/bin/nomad agent -config={{ nomad_root_dir }}/etc/nomad.hcl
 ExecReload=/bin/kill --signal HUP $MAINPID
-KillMode=process
-KillSignal=SIGINT
+SuccessExitStatus=1
 Restart=on-failure
 LimitNOFILE=65536
 LimitNPROC=infinity