diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml
index e826f68..ed792e9 100644
--- a/roles/metabase/defaults/main.yml
+++ b/roles/metabase/defaults/main.yml
@@ -1,15 +1,15 @@
 ---
 
 # Version to deploy
-metabase_version: 0.52.5
+metabase_version: 0.54.8
 # URL to fetch the jar
 metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}.x/metabase.jar
 # Expected sha256 of the jar
-metabase_jar_sha256: 64fbbe0f1358dfcf7c2146270ca1e65dfc8a8972ab053df935340f6229009f91
+metabase_jar_sha256: c427ed7d45759f1a2c398c46fe73a9f1a67e6ba3c21ef67ab4a2e0e4231e6ab1
 # When building from source
 metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz
 # Expected sha256 of the archive
-metabase_archive_sha256: f30b43c208e0aaafa49e0b0172e1d78122ef0e7bad841400461018807cd55c5b
+metabase_archive_sha256: 399fb345e8eff956734721573769a866454ec3b2661e858a96d8f7ba115e33e5
 # Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled
 metabase_manage_upgrade: True
 
diff --git a/roles/metabase/templates/metabase.service.j2 b/roles/metabase/templates/metabase.service.j2
index 46a0191..56b20b4 100644
--- a/roles/metabase/templates/metabase.service.j2
+++ b/roles/metabase/templates/metabase.service.j2
@@ -7,7 +7,7 @@ Type=simple
 User={{ metabase_user }}
 WorkingDirectory={{ metabase_root_dir }}/app
 EnvironmentFile={{ metabase_root_dir }}/etc/env
-ExecStart=/usr/bin/java -Djava.net.preferIPv4Stack=true \
+ExecStart=/usr/lib/jvm/jre-21/bin/java -Djava.net.preferIPv4Stack=true \
             -Djava.io.tmpdir={{ metabase_root_dir }}/tmp \
 {% if system_proxy is defined and system_proxy != '' %}
             -Dhttp.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttp.proxyPort={{ system_proxy | urlsplit('port') }} \
diff --git a/roles/metabase/vars/RedHat.yml b/roles/metabase/vars/RedHat.yml
index 6ec2fc1..adeb03b 100644
--- a/roles/metabase/vars/RedHat.yml
+++ b/roles/metabase/vars/RedHat.yml
@@ -1,9 +1,9 @@
 ---
 
 metabase_packages:
-  - java-11-openjdk
+  - java-21-openjdk
 
 metabase_build_packages:
-  - java-11-openjdk-devel
+  - java-21-openjdk-devel
   - patch
   - nodejs