diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix
index 80ea140a201..5681b33cb76 100644
--- a/pkgs/development/ocaml-modules/ff/default.nix
+++ b/pkgs/development/ocaml-modules/ff/default.nix
@@ -1,32 +1,22 @@
-{ lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }:
+{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }:
 
 buildDunePackage rec {
   pname = "ff";
-  version = "0.4.0";
-
-  src = fetchFromGitLab {
-    owner = "dannywillems";
-    repo = "ocaml-ff";
-    rev = version;
-    sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv";
-  };
-
-  useDune2 = true;
+  inherit (ff-sig) version src;
 
   propagatedBuildInputs = [
+    ff-sig
     zarith
   ];
 
   checkInputs = [
     alcotest
+    ff-pbt
   ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
-  meta = {
-    homepage = "https://gitlab.com/dannywillems/ocaml-ff";
+  meta = ff-sig.meta // {
     description = "OCaml implementation of Finite Field operations";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ulrikstrid ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix
index e0363160dd7..ffd78381127 100644
--- a/pkgs/development/ocaml-modules/ff/pbt.nix
+++ b/pkgs/development/ocaml-modules/ff/pbt.nix
@@ -1,8 +1,8 @@
-{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }:
+{ lib, buildDunePackage, zarith, ff-sig, alcotest }:
 
 buildDunePackage {
   pname = "ff-pbt";
-  inherit (ff-sig) version src doCheck useDune2;
+  inherit (ff-sig) version src;
 
   minimalOCamlVersion = "4.08";
 
@@ -10,6 +10,8 @@ buildDunePackage {
     alcotest
   ];
 
+  doCheck = true;
+
   propagatedBuildInputs = [
     zarith
     ff-sig
diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix
index a2c7ca0d0c6..503a26f6398 100644
--- a/pkgs/development/ocaml-modules/ff/sig.nix
+++ b/pkgs/development/ocaml-modules/ff/sig.nix
@@ -2,16 +2,14 @@
 
 buildDunePackage rec {
   pname = "ff-sig";
-  version = "0.6.1";
+  version = "0.6.2";
   src = fetchFromGitLab {
-    owner = "dannywillems";
-    repo = "ocaml-ff";
+    owner = "nomadic-labs";
+    repo = "cryptography/ocaml-ff";
     rev = version;
-    sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0";
+    sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y=";
   };
 
-  useDune2 = true;
-
   propagatedBuildInputs = [
     zarith
   ];
@@ -19,7 +17,7 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    homepage = "https://gitlab.com/dannywillems/ocaml-ff";
+    inherit (src.meta) homepage;
     description = "Minimal finite field signatures";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];