diff --git a/configure.ac b/configure.ac
index 3ff311c818..eda3716791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ define(_CLIENT_VERSION_MAJOR,       2)
 define(_CLIENT_VERSION_MINOR,       5)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD,       0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2022)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Gulden]])
diff --git a/contrib/gitian-descriptors/gitian-linux-electron.yml b/contrib/gitian-descriptors/gitian-linux-electron.yml
index 28bc331b6a..14bb95d217 100644
--- a/contrib/gitian-descriptors/gitian-linux-electron.yml
+++ b/contrib/gitian-descriptors/gitian-linux-electron.yml
@@ -45,11 +45,11 @@ script: |
 
   WRAP_DIR=$HOME/wrapped
   HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
-  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-man --enable-zmq --with-utils=no  --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
+  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --with-utils=no  --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
   FAKETIME_HOST_PROGS="gcc g++"
   FAKETIME_PROGS="date ar ranlib nm"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
   HOST_LDFLAGS=-static-libstdc++
 
   export EXTRA_CXX_FLAGS="-DNAPI_VERSION=5 -DDJINNI_NODEJS"
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 1b19ae28de..7d5c38c963 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -46,8 +46,8 @@ script: |
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-gui-tests"
   FAKETIME_HOST_PROGS="gcc g++"
   FAKETIME_PROGS="date ar ranlib nm"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
   HOST_LDFLAGS=-static-libstdc++
 
   export QT_RCC_TEST=1
diff --git a/contrib/gitian-descriptors/gitian-osx-electron.yml b/contrib/gitian-descriptors/gitian-osx-electron.yml
index 7b6c077dd9..46c518f262 100644
--- a/contrib/gitian-descriptors/gitian-osx-electron.yml
+++ b/contrib/gitian-descriptors/gitian-osx-electron.yml
@@ -46,11 +46,11 @@ script: |
 
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin14 arm64-apple-darwin21.1.0"
-  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --disable-bench --disable-tests --disable-man --enable-zmq --with-utils=no  --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
+  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --with-utils=no  --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="ar ranlib date dmg genisoimage"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
   HOST_LDFLAGS=
 
   export EXTRA_CXX_FLAGS="-DNAPI_VERSION=5 -DDJINNI_NODEJS"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 1681781810..cbefb4c3f6 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -47,8 +47,8 @@ script: |
   CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="ar ranlib date dmg genisoimage"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
   HOST_LDFLAGS=
 
 
diff --git a/contrib/gitian-descriptors/gitian-win-electron.yml b/contrib/gitian-descriptors/gitian-win-electron.yml
index 16001fea1c..771e44cd02 100644
--- a/contrib/gitian-descriptors/gitian-win-electron.yml
+++ b/contrib/gitian-descriptors/gitian-win-electron.yml
@@ -41,11 +41,11 @@ files:
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-w64-mingw32"
-  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-man --enable-zmq --with-utils=no --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
+  CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests --disable-bench --disable-tests --disable-tests --disable-man --enable-zmq --with-utils=no --with-daemon=no --with-node-js-libs --with-qrencode --with-gui=no"
   FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
 
   export QT_RCC_TEST=1
   export QT_RCC_SOURCE_DATE_OVERRIDE=1
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 0a01c96571..a412eaf7b5 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -42,8 +42,8 @@ script: |
   CONFIGFLAGS="--enable-reduce-exports --disable-gui-tests --disable-tests"
   FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy"
   FAKETIME_PROGS="date makensis zip"
-  HOST_CFLAGS="-O2 -g"
-  HOST_CXXFLAGS="-O2 -g"
+  HOST_CFLAGS="-O3 -g"
+  HOST_CXXFLAGS="-O3 -g"
 
   export QT_RCC_TEST=1
   export QT_RCC_SOURCE_DATE_OVERRIDE=1
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 5a6d37abb9..0fd7cbb76c 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -243,7 +243,7 @@ mkdir -p "$OUTDIR"
 CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary --disable-man --enable-zmq --with-node-js-libs --with-qrencode"
 
 # CFLAGS
-HOST_CFLAGS="-O2 -g"
+HOST_CFLAGS="-O3 -g"
 case "$HOST" in
     *linux*)  HOST_CFLAGS+=" -ffile-prefix-map=${PWD}=." ;;
     *mingw*)  HOST_CFLAGS+=" -fno-ident" ;;
@@ -259,7 +259,7 @@ esac
 
 # LDFLAGS
 case "$HOST" in
-    *linux*)  HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$glibc_dynamic_linker -static-libstdc++ -Wl,-O2" ;;
+    *linux*)  HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$glibc_dynamic_linker -static-libstdc++ -Wl,-O3" ;;
     *mingw*)  HOST_LDFLAGS="-Wl,--no-insert-timestamp" ;;
 esac