diff --git a/.github/scripts/main/preamble.sh b/.github/scripts/main/preamble.sh
index 2dce9b112cd..47bd2946442 100644
--- a/.github/scripts/main/preamble.sh
+++ b/.github/scripts/main/preamble.sh
@@ -12,6 +12,7 @@ OCAML_LOCAL=$CACHE/ocaml-local
 OPAM_LOCAL=$CACHE/opam-local
 if [ "$RUNNER_OS" = 'macOS' ]; then
   PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH"
+  PATH="/opt/homebrew/opt/gpatch/libexec/gnubin:$PATH"
 fi
 PATH=$OPAM_LOCAL/bin:$OCAML_LOCAL/bin:$PATH; export PATH
 
diff --git a/CHANGES b/CHANGES
index 1ae4709696a..078e37eb5d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ repositories (changes that are automatically handled by the format upgrade tools
 are not marked). Those prefixed with "(+)" are new command/option (since
 2.1.0~alpha2).
 
+2.3.0:
+* (no difference compared to 2.3.0~rc1)
+
 2.3.0~rc1:
 * Improve the release script by adding a NetBSD/x86_64 binary
   [#6258 @kit-ty-kate]
diff --git a/configure b/configure
index 7cf2abdfe9e..713a34472a9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for opam 2.3.0~rc1.
+# Generated by GNU Autoconf 2.71 for opam 2.3.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -609,8 +609,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.3.0~rc1'
-PACKAGE_STRING='opam 2.3.0~rc1'
+PACKAGE_VERSION='2.3.0'
+PACKAGE_STRING='opam 2.3.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.3.0~rc1 to adapt to many kinds of systems.
+\`configure' configures opam 2.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.3.0~rc1:";;
+     short | recursive ) echo "Configuration of opam 2.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1478,7 +1478,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.3.0~rc1
+opam configure 2.3.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1595,7 +1595,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.3.0~rc1, which was
+It was created by opam $as_me 2.3.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -7613,7 +7613,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.3.0~rc1, which was
+This file was extended by opam $as_me 2.3.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7668,7 +7668,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-opam config.status 2.3.0~rc1
+opam config.status 2.3.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 7ec6306f989..c75314595be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT([opam],[VERSION]) with no extra spaces
-AC_INIT([opam],[2.3.0~rc1])
+AC_INIT([opam],[2.3.0])
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/opam-client.opam b/opam-client.opam
index 4ecb696050b..f1ad1f8adbe 100644
--- a/opam-client.opam
+++ b/opam-client.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Client library for opam 2.3"
 description: """
 Actions on the opam root, switches, installations, and front-end.
diff --git a/opam-core.opam b/opam-core.opam
index 2551a3a8a4c..b6feb9eac4f 100644
--- a/opam-core.opam
+++ b/opam-core.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Core library for opam 2.3"
 description:
   "Small standard library extensions, and generic system interaction modules used by opam."
diff --git a/opam-devel.opam b/opam-devel.opam
index bc37d98666d..58d75c0063c 100644
--- a/opam-devel.opam
+++ b/opam-devel.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Bootstrapped development binary for opam 2.3"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.
diff --git a/opam-format.opam b/opam-format.opam
index 4ad2996d336..12b14dae73d 100644
--- a/opam-format.opam
+++ b/opam-format.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Format library for opam 2.3"
 description: """
 Definition of opam datastructures and its file interface.
diff --git a/opam-installer.opam b/opam-installer.opam
index 65b987271f8..bdb20a78d52 100644
--- a/opam-installer.opam
+++ b/opam-installer.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.
diff --git a/opam-repository.opam b/opam-repository.opam
index 331f4cd5749..3221f099b1f 100644
--- a/opam-repository.opam
+++ b/opam-repository.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Repository library for opam 2.3"
 description: """
 This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
diff --git a/opam-solver.opam b/opam-solver.opam
index b6be9e537ac..19fb32c1f5b 100644
--- a/opam-solver.opam
+++ b/opam-solver.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "Solver library for opam 2.3"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.
diff --git a/opam-state.opam b/opam-state.opam
index a4392a88227..1c85334576c 100644
--- a/opam-state.opam
+++ b/opam-state.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.3.0~rc1"
+version: "2.3.0"
 synopsis: "State library for opam 2.3"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.