diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index e7ea6f9a911..88ef8011aa8 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -189,10 +189,10 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ ] {
-    version = "v8.6.0-10-g2432994";
-    rev = "2432994b4a0a63f28b21aad23d0c3c90c7630890";
-    sha256 = "1q0i20qag2c8jh6jw63s09d8nr6m1zaz4hqblg5mmmp5zh6fllk6";
+  containers = mkContrib "containers" [ "8.6" ] {
+    version = "8.6.0";
+    rev = "fa1fec7";
+    sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
   };
 
   continuations = mkContrib "continuations" [ ] {
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index fd960e03db6..fd6fc21c680 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, newScope
+{ lib, callPackage, newScope, recurseIntoAttrs
 , gnumake3
 , ocamlPackages_3_12_1
 , ocamlPackages_4_02
@@ -10,6 +10,9 @@ let
       inherit callPackage coq;
       coqPackages = self;
 
+      contribs = recurseIntoAttrs
+        (callPackage ../development/coq-modules/contribs {});
+
       autosubst = callPackage ../development/coq-modules/autosubst {};
       bignums = if lib.versionAtLeast coq.coq-version "8.6"
         then callPackage ../development/coq-modules/bignums {}
@@ -33,11 +36,10 @@ let
       paco = callPackage ../development/coq-modules/paco {};
       QuickChick = callPackage ../development/coq-modules/QuickChick {};
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
-      contribs = callPackage ../development/coq-modules/contribs { };
     };
 
   filterCoqPackages = coq:
-    lib.filterAttrs
+    lib.filterAttrsRecursive
     (_: p:
       let pred = p.compatibleCoqVersions or (_: true);
       in pred coq.coq-version