diff --git a/coq-metacoq-erasure.opam b/coq-metacoq-erasure.opam
index c7d558a97..6d8d7138c 100644
--- a/coq-metacoq-erasure.opam
+++ b/coq-metacoq-erasure.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.11"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Abhishek Anand <aa755@cs.cornell.edu>"
           "Simon Boulier <simon.boulier@inria.fr>"
diff --git a/coq-metacoq-pcuic.opam b/coq-metacoq-pcuic.opam
index b1e037619..194447abe 100644
--- a/coq-metacoq-pcuic.opam
+++ b/coq-metacoq-pcuic.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.11"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Abhishek Anand <aa755@cs.cornell.edu>"
           "Simon Boulier <simon.boulier@inria.fr>"
diff --git a/coq-metacoq-safechecker.opam b/coq-metacoq-safechecker.opam
index c3bf87542..d831ee164 100644
--- a/coq-metacoq-safechecker.opam
+++ b/coq-metacoq-safechecker.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.11"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Abhishek Anand <aa755@cs.cornell.edu>"
           "Simon Boulier <simon.boulier@inria.fr>"
diff --git a/coq-metacoq-template.opam b/coq-metacoq-template.opam
index 8499e11cf..8be59798b 100644
--- a/coq-metacoq-template.opam
+++ b/coq-metacoq-template.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#master"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Abhishek Anand <aa755@cs.cornell.edu>"
           "Simon Boulier <simon.boulier@inria.fr>"
diff --git a/coq-metacoq-translations.opam b/coq-metacoq-translations.opam
index 136480dea..f3ea845f9 100644
--- a/coq-metacoq-translations.opam
+++ b/coq-metacoq-translations.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.11"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Simon Boulier <simon.boulier@inria.fr>"
           "Cyril Cohen <cyril.cohen@inria.fr>"
diff --git a/coq-metacoq.opam b/coq-metacoq.opam
index ad5a11739..e825f201b 100644
--- a/coq-metacoq.opam
+++ b/coq-metacoq.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 version: "8.15.dev"
 maintainer: "matthieu.sozeau@inria.fr"
 homepage: "https://metacoq.github.io/metacoq"
-dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.11"
+dev-repo: "git+https://github.com/MetaCoq/metacoq.git#coq-8.16"
 bug-reports: "https://github.com/MetaCoq/metacoq/issues"
 authors: ["Abhishek Anand <aa755@cs.cornell.edu>"
           "Simon Boulier <simon.boulier@inria.fr>"
diff --git a/make-opam-files.sh b/make-opam-files.sh
new file mode 100755
index 000000000..be6bb62a5
--- /dev/null
+++ b/make-opam-files.sh
@@ -0,0 +1,23 @@
+#/usr/bin/env bash
+echo "Target directory: " $1    
+echo "Target version: " $2
+echo "Releases package: " $3
+
+wget $3
+archive=`basename $3`
+hash=`shasum -a 512 $archive | cut -f 1 -d " "`
+
+echo "Shasum = " $hash
+
+for f in *.opam; 
+do 
+    opamf=${f/.opam/}; 
+    target=$1/$opamf/$opamf.$2/opam;
+    echo $opamf; 
+    mkdir $1/$opamf/$opamf.$2
+    gsed -e "/^version:.*/d" $f > $target
+    echo url { >> $target
+    echo "  src:" \"$3\" >> $target
+    echo "  checksum:" \"sha512=$hash\" >> $target
+    echo } >> $target
+done
\ No newline at end of file