diff --git a/build-constraints.yaml b/build-constraints.yaml
index cc6f31767..2ee628304 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3023,7 +3023,7 @@ packages:
     "Justus Adam <dev@justus.science> @JustusAdam":
         - marvin
         - marvin-interpolate
-        - mustache < 0 # 2.4.0 https://github.com/JustusAdam/mustache/issues/58
+        - mustache
         - exit-codes
 
     "Cindy Wang <cindylinz@gmail.com> @CindyLinz":
@@ -6472,7 +6472,7 @@ packages:
         - hasmin < 0 # tried hasmin-1.0.3, but its *executable* does not support: optparse-applicative-0.17.0.0
         - hasmin < 0 # tried hasmin-1.0.3, but its *library* does not support: attoparsec-0.14.4
         - haxl-amazonka < 0 # tried haxl-amazonka-0.1.1, but its *library* requires the disabled package: haxl
-        - headroom < 0 # tried headroom-0.4.3.0, but its *library* requires the disabled package: mustache
+        - headroom < 0 # tried headroom-0.4.3.0, but its *library* requires the disabled package: string-interpolate
         - heist < 0 # tried heist-1.1.0.1, but its *library* does not support: aeson-2.0.3.0
         - heist < 0 # tried heist-1.1.0.1, but its *library* does not support: attoparsec-0.14.4
         - heist < 0 # tried heist-1.1.0.1, but its *library* does not support: base-4.16.1.0
@@ -6771,7 +6771,6 @@ packages:
         - mallard < 0 # tried mallard-0.6.1.1, but its *library* requires the disabled package: Interpolation
         - map-syntax < 0 # tried map-syntax-0.3, but its *library* does not support: base-4.16.1.0
         - markup < 0 # tried markup-4.2.0, but its *library* requires the disabled package: attoparsec-uri
-        - marvin < 0 # tried marvin-0.2.5, but its *executable* requires the disabled package: mustache
         - marvin < 0 # tried marvin-0.2.5, but its *library* does not support: aeson-2.0.3.0
         - marvin < 0 # tried marvin-0.2.5, but its *library* does not support: http-client-0.7.11
         - marvin < 0 # tried marvin-0.2.5, but its *library* does not support: lens-5.1
@@ -7323,7 +7322,8 @@ packages:
         - sqlite-simple < 0 # tried sqlite-simple-0.4.18.0, but its *library* does not support: semigroups-0.20
         - sqlite-simple-errors < 0 # tried sqlite-simple-errors-0.6.1.0, but its *library* does not support: text-1.2.5.0
         - srt-dhall < 0 # tried srt-dhall-0.1.0.0, but its *library* does not support: dhall-1.41.1
-        - stack < 0 # tried stack-2.7.5, but its *library* requires the disabled package: mustache
+        - stack < 0 # tried stack-2.7.5, but its *library* requires the disabled package: hpack
+        - stack < 0 # tried stack-2.7.5, but its *library* requires the disabled package: pantry
         - stackcollapse-ghc < 0 # tried stackcollapse-ghc-0.0.1.4, but its *executable* does not support: base-4.16.1.0
         - stm-supply < 0 # tried stm-supply-0.2.0.0, but its *library* requires the disabled package: concurrent-supply
         - streaming-attoparsec < 0 # tried streaming-attoparsec-1.0.0.1, but its *library* requires the disabled package: streaming-bytestring