diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index 6a1667b9a7d..0dcdc3f8ee1 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -110,7 +110,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd ../amrex && git checkout --detach 9d2f762f4897b5f585544baf87a19edd0f0c9560 && cd -
+        cd ../amrex && git checkout --detach 23.05 && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
 
   build_nvhpc21-11-nvcc:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cc0f78dbcd..d02eba569e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.20.0)
-project(WarpX VERSION 23.04)
+project(WarpX VERSION 23.05)
 
 include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
 
diff --git a/Docs/source/conf.py b/Docs/source/conf.py
index 497ef341b3c..ebb03353325 100644
--- a/Docs/source/conf.py
+++ b/Docs/source/conf.py
@@ -78,9 +78,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'23.04'
+version = u'23.05'
 # The full version, including alpha/beta/rc tags.
-release = u'23.04'
+release = u'23.05'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/Examples/Tests/electrostatic_sphere_eb/analysis_rz.py b/Examples/Tests/electrostatic_sphere_eb/analysis_rz.py
index 11c04d5c7a0..5d807a2dbd3 100755
--- a/Examples/Tests/electrostatic_sphere_eb/analysis_rz.py
+++ b/Examples/Tests/electrostatic_sphere_eb/analysis_rz.py
@@ -20,12 +20,13 @@
 import sys
 
 import numpy as np
+from unyt import m
 import yt
 
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
 import checksumAPI
 
-tolerance = 0.004
+tolerance = 0.0041
 
 fn = sys.argv[1]
 ds = yt.load( fn )
@@ -47,7 +48,8 @@
 errmax_phi = 0.0
 errmax_Er = 0.0
 for i in range(len(r)):
-    if r[i]>=0.1:
+    # outside EB and last cutcell
+    if r[i] > 0.1*m + dr:
         phi_theory = A+B*np.log(r[i])
         Er_theory = -B/float(r[i])
         err = abs( phi_theory - phi[i,:] ).max() / phi_theory
diff --git a/LICENSE.txt b/LICENSE.txt
index 457ddd0c75b..bf1ea51eb26 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-WarpX v23.04 Copyright (c) 2018-2023, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
+WarpX v23.05 Copyright (c) 2018-2023, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/Python/setup.py b/Python/setup.py
index fea89536a08..06783ea5170 100644
--- a/Python/setup.py
+++ b/Python/setup.py
@@ -54,7 +54,7 @@
     package_data = {}
 
 setup(name = 'pywarpx',
-      version = '23.04',
+      version = '23.05',
       packages = ['pywarpx'],
       package_dir = {'pywarpx': 'pywarpx'},
       description = """Wrapper of WarpX""",
diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json b/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json
index ac137cb3783..0d6e3cd058d 100644
--- a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json
+++ b/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json
@@ -1,6 +1,6 @@
 {
   "lev=0": {
-    "Er": 8497.669853722688,
-    "phi": 2035.6618484435153
+    "Er": 8487.661571728835,
+    "phi": 2036.0428085209824
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json b/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json
index 74996f211b0..ffa8d68f9d9 100644
--- a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json
+++ b/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json
@@ -1,10 +1,10 @@
 {
   "lev=0": {
-    "Er": 8497.669853733625,
-    "phi": 2035.6618484451055
+    "Er": 8487.661571739109,
+    "phi": 2036.0428085225362
   },
   "lev=1": {
-    "Er": 19546.08010855407,
-    "phi": 3290.7266050322164
+    "Er": 19519.172334977942,
+    "phi": 3291.0262856782897
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
index c6b52d89850..3bf022d2a20 100644
--- a/Regression/WarpX-GPU-tests.ini
+++ b/Regression/WarpX-GPU-tests.ini
@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
 
 [AMReX]
 dir = /home/regtester/git/amrex/
-branch = 9d2f762f4897b5f585544baf87a19edd0f0c9560
+branch = 23.05
 
 [source]
 dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index fd18b8cb1b6..7de5d704d03 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
 
 [AMReX]
 dir = /home/regtester/AMReX_RegTesting/amrex/
-branch = 9d2f762f4897b5f585544baf87a19edd0f0c9560
+branch = 23.05
 
 [source]
 dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index c6aa81e2380..54ed0ccd4bb 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -226,7 +226,7 @@ macro(find_amrex)
         endif()
         set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
 
-        find_package(AMReX 23.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
+        find_package(AMReX 23.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
         message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
     endif()
 endmacro()
@@ -240,7 +240,7 @@ set(WarpX_amrex_src ""
 set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
     CACHE STRING
     "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "9d2f762f4897b5f585544baf87a19edd0f0c9560"
+set(WarpX_amrex_branch "23.05"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 
diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake
index e112a726377..8ac31361239 100644
--- a/cmake/dependencies/PICSAR.cmake
+++ b/cmake/dependencies/PICSAR.cmake
@@ -82,7 +82,7 @@ function(find_picsar)
         #message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
     else()
         # not supported by PICSAR (yet)
-        #find_package(PICSAR 23.04 CONFIG REQUIRED QED)
+        #find_package(PICSAR 23.05 CONFIG REQUIRED QED)
         #message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
         message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
             "library yet. "
diff --git a/run_test.sh b/run_test.sh
index bc32a3233b7..c042e6d5892 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
 
 # Clone AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 9d2f762f4897b5f585544baf87a19edd0f0c9560 && cd -
+cd amrex && git checkout --detach 23.05 && cd -
 # warpx-data contains various required data sets
 git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
 # openPMD-example-datasets contains various required data sets
diff --git a/setup.py b/setup.py
index bdac34c85a6..d02b9ff667f 100644
--- a/setup.py
+++ b/setup.py
@@ -272,7 +272,7 @@ def build_extension(self, ext):
 setup(
     name='pywarpx',
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version = '23.04',
+    version = '23.05',
     packages = ['pywarpx'],
     package_dir = {'pywarpx': 'Python/pywarpx'},
     author='Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.',