diff --git a/pkgs/athena-bccr/firmador.nix b/pkgs/athena-bccr/firmador.nix
index feec48e..42ce79e 100644
--- a/pkgs/athena-bccr/firmador.nix
+++ b/pkgs/athena-bccr/firmador.nix
@@ -3,15 +3,15 @@
   lib,
   makeWrapper,
   maven,
-  openjdk,
+  openjdk21,
   wrapGAppsHook3,
   pkcs11-module ? null,
 }: let
-  jdk = openjdk.override {
+  jdk = openjdk21.override {
     enableJavaFX = true;
   };
 
-  version = "1.9.8+master";
+  version = "2.0.0+master";
 in
   maven.buildMavenPackage {
     pname = "firmador";
@@ -19,15 +19,16 @@ in
 
     src = fetchgit {
       url = "https://codeberg.org/firmador/firmador";
-      rev = "676b0e3c0dc5adb0628d4d98efcfccfca3daa8a7";
-      hash = "sha256-f/EKll1csvUCRSt4G1SeDB4gVW+ZtUgJjlmM7PlafyQ=";
+      rev = "76a16ff5fa7c1a9c3f4a03359742fc09cb98b2c4";
+      hash = "sha256-xzcJXIU3NFPUdwRNUvymScpBS1eeJYdb8ffevUbAS1o=";
     };
 
     patches = [
       ./0001-Remove-CheckUpdatePlugin-from-default-list.patch
     ];
 
-    mvnHash = "sha256-QDjhwrKZK/cEQxRYUM+z1zMCNrTHyxRqAhUfNtubhhI=";
+    mvnJdk = jdk;
+    mvnHash = "sha256-SCTXlLqc4SxWWZlQLJc+T7jM991LLwU9MqDALcbECsw=";
 
     nativeBuildInputs = [
       makeWrapper