diff --git a/packages/goblint-cil/goblint-cil.2.0.4/opam b/packages/goblint-cil/goblint-cil.2.0.4/opam
new file mode 100644
index 000000000000..81d70acd1e94
--- /dev/null
+++ b/packages/goblint-cil/goblint-cil.2.0.4/opam
@@ -0,0 +1,77 @@
+opam-version: "2.0"
+synopsis:
+  "A front-end for the C programming language that facilitates program analysis and transformation"
+description: """
+This is a fork of the 'cil' package used for 'goblint'. Major changes include:
+* Support for C99 and C11.
+* Compatibility with modern OCaml versions.
+* Use Zarith instead of Num and use that for integer constants.
+* Improved locations with columns and spans.
+* Removal of unmaintained extensions and MSVC support.
+* Use dune instead of make and ocamlbuild.
+* Many bug fixes."""
+maintainer: [
+  "Michael Schwarz <michael.schwarz93@gmail.com>"
+  "Simmo Saan <simmo.saan@gmail.com>"
+]
+authors: [
+  "George Necula"
+  "Scott McPeak"
+  "Westley Weimer"
+  "Gabriel Kerneis"
+  "Ralf Vogler"
+  "Michael Schwarz"
+  "Simmo Saan"
+]
+license: "BSD-3-Clause"
+homepage: "https://github.com/goblint/cil"
+bug-reports: "https://github.com/goblint/cil/issues"
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "ocamlfind" {with-test}
+  "zarith"
+  "hevea" {with-doc}
+  "dune" {>= "2.7"}
+  "dune-configurator"
+  "odoc" {with-doc}
+  "stdlib-shims"
+  "ppx_deriving_yojson" {>= "3.2"}
+  "yojson"
+  "conf-perl"
+  "cppo"
+  "conf-gcc"
+]
+conflicts: ["cil"]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/goblint/cil.git"
+depexts: [
+  ["perl-ExtUtils-MakeMaker"] {os-distribution = "centos" | os-distribution = "fedora" | os-distribution = "ol"}
+  ["perl-FindBin"] {os-distribution = "fedora"}
+  ["build-base"] {os-distribution = "alpine"}
+]
+available: arch = "x86_64" | arch = "arm64"
+url {
+  src:
+    "https://github.com/goblint/cil/releases/download/2.0.4/goblint-cil-2.0.4.tbz"
+  checksum: [
+    "sha256=adea96efdb7611a688849491b363bcd5fc1e1fb8d6a937185560faefb42dd9cb"
+    "sha512=b8d8d835e9425cbbd59aeb06ce457e110cbd91c982d99c51e5a24bd5b7b9362f545db32c33ac6abc87a02015f29c8dc19e97ceb756ae1aefc659914f3598df19"
+  ]
+}
+x-commit-hash: "317e26d48b06d5cdc4acff3df1a6824587052b53"
+x-ci-accept-failures: [
+  "freebsd" # installed cilly binary is not found for some reason (https://github.com/ocaml/opam-repository/pull/24812#issuecomment-1819231335)
+]
diff --git a/packages/goblint/goblint.2.2.1/opam b/packages/goblint/goblint.2.2.1/opam
index 53e8b89db981..4ae7c44c00ad 100644
--- a/packages/goblint/goblint.2.2.1/opam
+++ b/packages/goblint/goblint.2.2.1/opam
@@ -20,7 +20,7 @@ bug-reports: "https://github.com/goblint/analyzer/issues"
 depends: [
   "dune" {>= "3.6"}
   "ocaml" {>= "4.10"}
-  "goblint-cil" {>= "2.0.2"}
+  "goblint-cil" {>= "2.0.2" & < "2.0.4"}
   "batteries" {>= "3.5.0"}
   "zarith" {>= "1.8"}
   "yojson" {>= "2.0.0"}
@@ -73,7 +73,7 @@ build: [
 dev-repo: "git+https://github.com/goblint/analyzer.git"
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
-available: os-distribution != "alpine" & arch != "arm64"
+available: os-family != "bsd" & os-distribution != "alpine" & arch != "arm64"
 # pin-depends: [
   # published goblint-cil 2.0.2 is currently up-to-date, so no pin needed
   # [ "goblint-cil.2.0.2" "git+https://github.com/goblint/cil.git#98598d94f796a63751e5a9d39c6b3a9fe1f32330" ]
@@ -92,3 +92,6 @@ url {
   ]
 }
 x-commit-hash: "166a9b619b87456059de8f1839fb810621302efb"
+x-ci-accept-failures: [
+  "macos-homebrew" # newer MacOS headers cannot be parsed (https://github.com/ocaml/opam-repository/pull/26307#issuecomment-2258080206)
+]
diff --git a/packages/goblint/goblint.2.3.0/opam b/packages/goblint/goblint.2.3.0/opam
index 733ccdaf75ee..93be8f866977 100644
--- a/packages/goblint/goblint.2.3.0/opam
+++ b/packages/goblint/goblint.2.3.0/opam
@@ -20,7 +20,7 @@ bug-reports: "https://github.com/goblint/analyzer/issues"
 depends: [
   "dune" {>= "3.7"}
   "ocaml" {>= "4.10"}
-  "goblint-cil" {>= "2.0.3"}
+  "goblint-cil" {>= "2.0.3" & < "2.0.4"}
   "batteries" {>= "3.5.0"}
   "zarith" {>= "1.8"}
   "yojson" {>= "2.0.0"}
@@ -73,7 +73,7 @@ build: [
 dev-repo: "git+https://github.com/goblint/analyzer.git"
 # on `dune build` goblint.opam will be generated from goblint.opam.template and dune-project
 # also remember to generate/adjust goblint.opam.locked!
-available: os-distribution != "alpine" & arch != "arm64"
+available: os-family != "bsd" & os-distribution != "alpine" & arch != "arm64"
 # pin-depends: [
   # published goblint-cil 2.0.3 is currently up-to-date, so no pin needed
   # [ "goblint-cil.2.0.3" "git+https://github.com/goblint/cil.git#d2760bacfbfdb25a374254de44f2ff1cb5f42abd" ]
@@ -92,3 +92,6 @@ url {
   ]
 }
 x-commit-hash: "dbd6479a53dbf76f351f853bbc9092d659a8a631"
+x-ci-accept-failures: [
+  "macos-homebrew" # newer MacOS headers cannot be parsed (https://github.com/ocaml/opam-repository/pull/26307#issuecomment-2258080206)
+]