diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index 71775879896..7e1cf7ae63f 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -115,7 +115,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd ../amrex && git checkout --detach 1f038e767011e20100af6ab0db02c69cf7ebe55c && cd -
+        cd ../amrex && git checkout --detach 259db7cfb99e7d1d2ab4bec9b1587fdf624a138a && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
 
         ccache -s
diff --git a/Docs/source/usage/parameters.rst b/Docs/source/usage/parameters.rst
index ae1353159dd..4dc888df3d0 100644
--- a/Docs/source/usage/parameters.rst
+++ b/Docs/source/usage/parameters.rst
@@ -581,11 +581,26 @@ Additional PML parameters
 Embedded Boundary Conditions
 ----------------------------
 
-* ``warpx.eb_implicit_function`` (`string`)
-    A function of `x`, `y`, `z` that defines the surface of the embedded
-    boundary. That surface lies where the function value is 0 ;
-    the physics simulation area is where the function value is negative ;
-    the interior of the embeddded boundary is where the function value is positive.
+In WarpX, the embedded boundary can be defined in either of two ways:
+
+    - **From an analytical function:**
+        In that case, you will need to set the following parameter in the input file.
+
+        * ``warpx.eb_implicit_function`` (`string`)
+            A function of `x`, `y`, `z` that defines the surface of the embedded
+            boundary. That surface lies where the function value is 0 ;
+            the physics simulation area is where the function value is negative ;
+            the interior of the embeddded boundary is where the function value is positive.
+
+    - **From an STL file:**
+        In that case, you will need to set the following parameters in the input file.
+
+        * ``eb2.stl_file`` (`string`)
+            The path to an STL file. In addition, you also need to set ``eb2.geom_type = stl``,
+            in order for the file to be read by WarpX.
+
+Whether the embedded boundary is defined with an analytical function or an STL file, you can
+additionally define the electric potential at the embedded boundary with an analytical function:
 
 * ``warpx.eb_potential(x,y,z,t)`` (`string`)
     Gives the value of the electric potential at the surface of the embedded boundary,
@@ -2431,7 +2446,7 @@ Grid types (collocated, staggered, hybrid)
     For example, :math:`E_z` is gathered using ``algo.particle_shape`` along :math:`(x,y)` and ``algo.particle_shape - 1`` along :math:`z`.
     See equations (21)-(23) of :cite:t:`param-Godfrey2013` and associated references for details.
 
-    Default: ``interpolation.galerkin_scheme = 0`` with collocated grids and/or momentum-conserving field gathering, ``interpolation.galerkin_scheme = 1`` otherwise.
+    Default: ``interpolation.galerkin_scheme = 0`` with collocated grids, or momentum-conserving field gathering, or when ``algo.current_deposition = direct`` ; ``interpolation.galerkin_scheme = 1`` otherwise.
 
     .. warning::
 
diff --git a/Examples/Tests/collision/inputs_3d b/Examples/Tests/collision/inputs_3d
index ed413ba2776..11d6b150dd2 100644
--- a/Examples/Tests/collision/inputs_3d
+++ b/Examples/Tests/collision/inputs_3d
@@ -22,6 +22,7 @@ boundary.field_hi = periodic periodic periodic
 warpx.serialize_initial_conditions = 1
 warpx.verbose = 1
 warpx.const_dt = 1.224744871e-07
+warpx.random_seed = 2034958209
 
 # Do not evolve the E and B fields
 algo.maxwell_solver = none
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json
index 378b7691898..07c990b3997 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json
@@ -1,40 +1,40 @@
 {
-  "electrons": {
-    "particle_momentum_x": 4.2387000553111037e-20,
-    "particle_momentum_y": 0.0,
-    "particle_momentum_z": 4.238700039223283e-20,
-    "particle_position_x": 0.6553599659707846,
-    "particle_position_y": 0.6553599659699976,
-    "particle_weight": 3200000000000000.5
-  },
   "lev=0": {
     "Bx": 0.0,
-    "By": 46.86760020196344,
+    "By": 46.65494014556924,
     "Bz": 0.0,
-    "Ex": 7589330186947.288,
+    "Ex": 7596470155558.35,
     "Ey": 0.0,
-    "Ez": 7589330198843.742,
-    "jx": 7283102663077210.0,
+    "Ez": 7596470167219.471,
+    "jx": 7277974695617658.0,
     "jy": 0.0,
-    "jz": 7283102630279985.0
+    "jz": 7277974664068728.0
   },
   "lev=1": {
     "Bx": 0.0,
-    "By": 369.2209081024592,
+    "By": 371.2497742366917,
     "Bz": 0.0,
-    "Ex": 7593801203430.788,
+    "Ex": 7596619292118.433,
     "Ey": 0.0,
-    "Ez": 7593800988021.711,
-    "jx": 6597471633118175.0,
+    "Ez": 7596619076137.7295,
+    "jx": 6592788899529852.0,
     "jy": 0.0,
-    "jz": 6597471447306984.0
+    "jz": 6592788734672843.0
+  },
+  "electrons": {
+    "particle_momentum_x": 4.2314133085678375e-20,
+    "particle_momentum_y": 0.0,
+    "particle_momentum_z": 4.2314132920088513e-20,
+    "particle_position_x": 0.6553599899254421,
+    "particle_position_y": 0.6553599899246253,
+    "particle_weight": 3200000000000000.5
   },
   "positrons": {
-    "particle_momentum_x": 4.238670783273887e-20,
+    "particle_momentum_x": 4.2314444192249906e-20,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 4.238670762294589e-20,
-    "particle_position_x": 0.6553596917214832,
-    "particle_position_y": 0.6553596917221793,
+    "particle_momentum_z": 4.231444401040395e-20,
+    "particle_position_x": 0.655359770013864,
+    "particle_position_y": 0.6553597700144888,
     "particle_weight": 3200000000000000.5
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json
index 85a09296e38..c59a09cc616 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json
@@ -1,27 +1,27 @@
 {
-  "electrons": {
-    "particle_momentum_x": 5.663705661977914e-20,
-    "particle_momentum_y": 0.0,
-    "particle_momentum_z": 5.663705661977915e-20,
-    "particle_position_x": 0.65536,
-    "particle_position_y": 0.6553599999999999,
-    "particle_weight": 3200000000000000.5
-  },
   "lev=0": {
-    "Ex": 3771082811318.298,
+    "Ex": 3751590727260.198,
     "Ey": 0.0,
-    "Ez": 3771082811318.301,
-    "jx": 1.009365330460902e+16,
+    "Ez": 3751590727260.1885,
+    "jx": 1.0100623838390416e+16,
     "jy": 0.0,
-    "jz": 1.009365330460902e+16,
+    "jz": 1.0100623838390416e+16,
     "part_per_cell": 131072.0
   },
   "positrons": {
-    "particle_momentum_x": 5.663705661977916e-20,
+    "particle_momentum_x": 5.668407775012392e-20,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 5.663705661977916e-20,
+    "particle_momentum_z": 5.668407775012392e-20,
     "particle_position_x": 0.65536,
     "particle_position_y": 0.65536,
     "particle_weight": 3200000000000000.5
+  },
+  "electrons": {
+    "particle_momentum_x": 5.668407775012391e-20,
+    "particle_momentum_y": 0.0,
+    "particle_momentum_z": 5.668407775012391e-20,
+    "particle_position_x": 0.65536,
+    "particle_position_y": 0.6553600000000002,
+    "particle_weight": 3200000000000000.5
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json
index c342d9dcaeb..ddf519913bd 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json
@@ -1,29 +1,29 @@
 {
-  "electrons": {
-    "particle_momentum_x": 5.663705657675969e-20,
-    "particle_momentum_y": 0.0,
-    "particle_momentum_z": 5.663705657675969e-20,
-    "particle_position_x": 0.65536,
-    "particle_position_y": 0.65536,
-    "particle_weight": 3200000000000000.5
-  },
   "lev=0": {
     "Bx": 0.0,
-    "By": 3.4892704618136277,
+    "By": 5.710236645367475,
     "Bz": 0.0,
-    "Ex": 3771082786646.7104,
+    "Ex": 3751590785149.1333,
     "Ey": 0.0,
-    "Ez": 3771082786646.702,
-    "jx": 1.0093631772735916e+16,
+    "Ez": 3751590785149.124,
+    "jx": 1.0100602372860838e+16,
     "jy": 0.0,
-    "jz": 1.0093631772735912e+16
+    "jz": 1.0100602372860836e+16
   },
   "positrons": {
-    "particle_momentum_x": 5.663705657675971e-20,
+    "particle_momentum_x": 5.668407759026453e-20,
     "particle_momentum_y": 0.0,
-    "particle_momentum_z": 5.663705657675969e-20,
-    "particle_position_x": 0.65536,
+    "particle_momentum_z": 5.668407759026454e-20,
+    "particle_position_x": 0.6553599999999999,
     "particle_position_y": 0.65536,
     "particle_weight": 3200000000000000.5
+  },
+  "electrons": {
+    "particle_momentum_x": 5.668407759026452e-20,
+    "particle_momentum_y": 0.0,
+    "particle_momentum_z": 5.668407759026452e-20,
+    "particle_position_x": 0.65536,
+    "particle_position_y": 0.6553600000000002,
+    "particle_weight": 3200000000000000.5
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json
index c9339aeb1aa..7098b83dbac 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json
@@ -1,30 +1,30 @@
 {
-  "electrons": {
-    "particle_momentum_x": 9.520485222844096e-20,
-    "particle_position_x": 2.6214400000233367,
-    "particle_position_y": 2.6214400000233367,
-    "particle_position_z": 2.6214400000000007,
-    "particle_weight": 128000000000.00002
-  },
   "lev=0": {
-    "Bx": 78.90261993791012,
-    "By": 78.90261993794903,
-    "Bz": 78.9041393998435,
-    "Ex": 84580428018688.97,
-    "Ey": 84580428018688.73,
-    "Ez": 84580441923246.2,
-    "F": 685.6927382678912,
-    "divE": 7.94184911020468e+19,
-    "jx": 6.007457695701311e+16,
-    "jy": 6.007457695701312e+16,
-    "jz": 6.007453636158103e+16,
+    "Bx": 86.03228226677659,
+    "By": 86.03228226679013,
+    "Bz": 86.033798606458,
+    "Ex": 84659309211473.42,
+    "Ey": 84659309211473.42,
+    "Ez": 84659323064827.52,
+    "F": 700.2020613746595,
+    "divE": 7.94984970149747e+19,
+    "jx": 5.999100369888243e+16,
+    "jy": 5.999100369888247e+16,
+    "jz": 5.999096310379822e+16,
     "part_per_cell": 524288.0,
-    "rho": 705198439.2596256
+    "rho": 705877712.4251474
   },
   "positrons": {
-    "particle_momentum_z": 9.520479438980041e-20,
-    "particle_position_x": 2.6214400000233367,
-    "particle_position_y": 2.6214400000233358,
+    "particle_momentum_z": 9.508931687286131e-20,
+    "particle_position_x": 2.621440000034161,
+    "particle_position_y": 2.6214400000341618,
     "particle_position_z": 2.62144
+  },
+  "electrons": {
+    "particle_momentum_x": 9.508937471997448e-20,
+    "particle_position_x": 2.6214400000341604,
+    "particle_position_y": 2.621440000034161,
+    "particle_position_z": 2.6214399999999993,
+    "particle_weight": 128000000000.00002
   }
-}
+}
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json
index 487d4a89828..e1785dcce4d 100644
--- a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json
+++ b/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json
@@ -1,28 +1,28 @@
 {
-  "electrons": {
-    "particle_momentum_x": 9.633869745818886e-20,
-    "particle_position_x": 2.621440000001177,
-    "particle_position_y": 2.6214400000011784,
-    "particle_position_z": 2.6214400000000007,
-    "particle_weight": 128000000000.00002
-  },
   "lev=0": {
-    "Bx": 80.96035538655111,
-    "By": 80.96035538657691,
-    "Bz": 80.96271445263956,
-    "Ex": 84777489275096.88,
-    "Ey": 84777489275096.88,
-    "Ez": 84777485856239.4,
-    "jx": 6.08447015360442e+16,
-    "jy": 6.084470153604425e+16,
-    "jz": 6.084470085554113e+16,
+    "Bx": 88.73949682623977,
+    "By": 88.73949682627456,
+    "Bz": 88.74185838578241,
+    "Ex": 84851140116479.64,
+    "Ey": 84851140116479.62,
+    "Ez": 84851136696893.72,
+    "jx": 6.075773528102969e+16,
+    "jy": 6.0757735281029736e+16,
+    "jz": 6.075773460167053e+16,
     "part_per_cell": 524288.0,
-    "rho": 703546536.8089281
+    "rho": 704298346.5173542
   },
   "positrons": {
-    "particle_momentum_z": 9.63386961193585e-20,
-    "particle_position_x": 2.621440000001177,
-    "particle_position_y": 2.621440000001179,
-    "particle_position_z": 2.6214400000000007
+    "particle_momentum_z": 9.621748455552108e-20,
+    "particle_position_x": 2.621440000001309,
+    "particle_position_y": 2.6214400000013076,
+    "particle_position_z": 2.6214399999999998
+  },
+  "electrons": {
+    "particle_momentum_x": 9.621748589257923e-20,
+    "particle_position_x": 2.621440000001309,
+    "particle_position_y": 2.6214400000013076,
+    "particle_position_z": 2.6214399999999998,
+    "particle_weight": 128000000000.00002
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Python_Langmuir.json b/Regression/Checksum/benchmarks_json/Python_Langmuir.json
index 950d7f9194a..46867790cb4 100644
--- a/Regression/Checksum/benchmarks_json/Python_Langmuir.json
+++ b/Regression/Checksum/benchmarks_json/Python_Langmuir.json
@@ -1,13 +1,13 @@
 {
+  "lev=0": {
+    "Ex": 3047094224871324.5,
+    "jx": 3.294250379355652e+18
+  },
   "electrons": {
-    "particle_momentum_x": 1.7507165884671642e-17,
-    "particle_position_x": 10.350911572498216,
-    "particle_position_y": 10.485760000000003,
-    "particle_position_z": 10.485760000000003,
+    "particle_momentum_x": 1.740964347107983e-17,
+    "particle_position_x": 10.351045542291539,
+    "particle_position_y": 10.485759999999997,
+    "particle_position_z": 10.48576,
     "particle_weight": 320000000000.00006
-  },
-  "lev=0": {
-    "Ex": 3091324128949712.5,
-    "jx": 3.3015975627803766e+18
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json b/Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json
index 2d1ca2f23c5..d152ff41998 100644
--- a/Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json
+++ b/Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json
@@ -1,12 +1,12 @@
 {
+  "lev=0": {
+    "Ex": 53556162492188.62,
+    "jx": 5.722548841990386e+16
+  },
   "electrons": {
-    "particle_momentum_x": 1.0449418710231497e-19,
-    "particle_position_x": 0.0831205701527011,
-    "particle_position_y": 0.08192,
+    "particle_momentum_x": 1.0581442023547547e-19,
+    "particle_position_x": 0.0831038802568349,
+    "particle_position_y": 0.08191999999999999,
     "particle_weight": 8000000000000001.0
-  },
-  "lev=0": {
-    "Ex": 54311177004701.516,
-    "jx": 5.639670983525456e+16
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/Python_gaussian_beam.json b/Regression/Checksum/benchmarks_json/Python_gaussian_beam.json
index 2129e8af565..2b4297e3627 100644
--- a/Regression/Checksum/benchmarks_json/Python_gaussian_beam.json
+++ b/Regression/Checksum/benchmarks_json/Python_gaussian_beam.json
@@ -1,32 +1,32 @@
 {
-  "electrons": {
-    "particle_momentum_x": 6.808479576836945e-20,
-    "particle_momentum_y": 6.876934757849776e-20,
-    "particle_momentum_z": 6.802215755177324e-20,
-    "particle_position_x": 6339.279719574188,
-    "particle_position_y": 6400.519522256783,
-    "particle_position_z": 6332.552838182088,
-    "particle_weight": 4999999954710.04
-  },
   "lev=0": {
-    "Bx": 2.18760546171463e-05,
-    "By": 1.777427672926153e-05,
-    "Bz": 1.798431779205324e-05,
-    "Ex": 262735.3418998487,
-    "Ey": 264285.9081716973,
-    "Ez": 262283.0576561827,
-    "jx": 930.8363498458478,
-    "jy": 940.577756171662,
-    "jz": 929.9701516370898,
+    "Bx": 2.1885709623428054e-05,
+    "By": 1.7781538740987698e-05,
+    "Bz": 1.798374460438725e-05,
+    "Ex": 262814.04898035893,
+    "Ey": 264360.66474815976,
+    "Ez": 262360.8533027486,
+    "jx": 931.6306925490601,
+    "jy": 941.3279496407436,
+    "jz": 930.7478072804985,
     "part_per_cell": 65536.0
   },
+  "electrons": {
+    "particle_momentum_x": 6.823819887231586e-20,
+    "particle_momentum_y": 6.891558962132863e-20,
+    "particle_momentum_z": 6.817050175691089e-20,
+    "particle_position_x": 6339.113170504729,
+    "particle_position_y": 6400.3586668158905,
+    "particle_position_z": 6332.387112999683,
+    "particle_weight": 4999999954710.04
+  },
   "protons": {
-    "particle_momentum_x": 3.177356695273816e-21,
-    "particle_momentum_y": 3.165603704977051e-21,
-    "particle_momentum_z": 3.157786057110636e-21,
-    "particle_position_x": 6550.923797287247,
-    "particle_position_y": 6537.195882086984,
-    "particle_position_z": 6523.379262220709,
+    "particle_momentum_x": 2.9968929267374238e-21,
+    "particle_momentum_y": 2.984482330834465e-21,
+    "particle_momentum_z": 2.9781449297861096e-21,
+    "particle_position_x": 6550.923883255297,
+    "particle_position_y": 6537.195968516041,
+    "particle_position_z": 6523.379347813018,
     "particle_weight": 4999999954710.04
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/collisionISO.json b/Regression/Checksum/benchmarks_json/collisionISO.json
index 96a2f5cbdac..5146837be6f 100644
--- a/Regression/Checksum/benchmarks_json/collisionISO.json
+++ b/Regression/Checksum/benchmarks_json/collisionISO.json
@@ -11,12 +11,12 @@
     "jz": 0.0
   },
   "electron": {
-    "particle_momentum_x": 3.5856774369040155e-19,
-    "particle_momentum_y": 3.5832349891760786e-19,
-    "particle_momentum_z": 3.5757013442445486e-19,
-    "particle_position_x": 1.0241562532152744,
-    "particle_position_y": 1.0238555904782611,
-    "particle_position_z": 1.0240053504978093,
+    "particle_momentum_x": 3.579130200773753e-19,
+    "particle_momentum_y": 3.5788119408700804e-19,
+    "particle_momentum_z": 3.584163522201744e-19,
+    "particle_position_x": 1.024188253213835,
+    "particle_position_y": 1.0238795904737117,
+    "particle_position_z": 1.02399735048655,
     "particle_weight": 714240000000.0
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/Checksum/benchmarks_json/collisionXYZ.json b/Regression/Checksum/benchmarks_json/collisionXYZ.json
index c87bbd98e42..7436302a99e 100644
--- a/Regression/Checksum/benchmarks_json/collisionXYZ.json
+++ b/Regression/Checksum/benchmarks_json/collisionXYZ.json
@@ -6,7 +6,7 @@
     "Ex": 0.0,
     "Ey": 0.0,
     "Ez": 0.0,
-    "T_electron": 358778.6506903592,
-    "T_ion": 341562.3085776466
+    "T_electron": 351570.64632548566,
+    "T_ion": 350085.3998917431
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/restart_psatd.json b/Regression/Checksum/benchmarks_json/restart_psatd.json
index d22fb5b57e7..fd31e7057f4 100644
--- a/Regression/Checksum/benchmarks_json/restart_psatd.json
+++ b/Regression/Checksum/benchmarks_json/restart_psatd.json
@@ -1,15 +1,33 @@
 {
   "lev=0": {
-    "Bx": 116102.13010406512,
-    "By": 245467.5412026496,
-    "Bz": 65305.35287114741,
-    "Ex": 118565481099326.73,
-    "Ey": 18640100573642.96,
-    "Ez": 51777969821120.38,
-    "jx": 2.1177246490642464e+16,
-    "jy": 351544815339900.3,
-    "jz": 4573466562652713.0,
-    "rho": 22294533.587530266
+    "Bx": 116097.15119490701,
+    "By": 245135.43138545044,
+    "Bz": 65087.42714316293,
+    "Ex": 118461420042835.34,
+    "Ey": 18622845483678.824,
+    "Ez": 51793144992361.125,
+    "jx": 2.1162465965376624e+16,
+    "jy": 349487178458066.6,
+    "jz": 4563460427657682.0,
+    "rho": 22252333.818822004
+  },
+  "driverback": {
+    "particle_momentum_x": 4.813131349021332e+21,
+    "particle_momentum_y": 5.16548074090123e+21,
+    "particle_momentum_z": 3.005830430844926e+25,
+    "particle_position_x": 0.001649481123084974,
+    "particle_position_y": 0.0016172218745428432,
+    "particle_position_z": 0.4899808854005956,
+    "particle_weight": 6241509074.460762
+  },
+  "plasma_e": {
+    "particle_momentum_x": 2.084066965693142e-19,
+    "particle_momentum_y": 1.330336553422521e-20,
+    "particle_momentum_z": 2.6335518561017005e-17,
+    "particle_position_x": 0.4991724057788647,
+    "particle_position_y": 0.49919697481183745,
+    "particle_position_z": 0.4562433914656611,
+    "particle_weight": 33067341227104.625
   },
   "beam": {
     "particle_momentum_x": 4.178482505909375e-19,
@@ -20,6 +38,15 @@
     "particle_position_z": 1.901942694291968,
     "particle_weight": 3120754537.230381
   },
+  "plasma_p": {
+    "particle_momentum_x": 2.097709570232301e-19,
+    "particle_momentum_y": 3.402465268604418e-21,
+    "particle_momentum_z": 4.82960000875208e-14,
+    "particle_position_x": 0.49912500313484137,
+    "particle_position_y": 0.4991249983460674,
+    "particle_position_z": 0.4563845471150555,
+    "particle_weight": 33067341227104.625
+  },
   "driver": {
     "particle_momentum_x": 4.700436405078562e+21,
     "particle_momentum_y": 4.6785862113093076e+21,
@@ -28,32 +55,5 @@
     "particle_position_y": 0.0016212373149699414,
     "particle_position_z": 0.30417779498653386,
     "particle_weight": 6241509074.460762
-  },
-  "driverback": {
-    "particle_momentum_x": 4.813131349021332e+21,
-    "particle_momentum_y": 5.16548074090123e+21,
-    "particle_momentum_z": 3.005830430844926e+25,
-    "particle_position_x": 0.001649481123084974,
-    "particle_position_y": 0.0016172218745428432,
-    "particle_position_z": 0.4899808854005956,
-    "particle_weight": 6241509074.460762
-  },
-  "plasma_e": {
-    "particle_momentum_x": 2.0912364079892767e-19,
-    "particle_momentum_y": 1.3510804924903876e-20,
-    "particle_momentum_z": 2.6336070297356917e-17,
-    "particle_position_x": 0.49917333523960167,
-    "particle_position_y": 0.49919828074154127,
-    "particle_position_z": 0.45624167532314724,
-    "particle_weight": 33067341227104.625
-  },
-  "plasma_p": {
-    "particle_momentum_x": 2.1053025446547977e-19,
-    "particle_momentum_y": 3.3272838305044046e-21,
-    "particle_momentum_z": 4.829599953646669e-14,
-    "particle_position_x": 0.49912500297599893,
-    "particle_position_y": 0.49912499825258866,
-    "particle_position_z": 0.45638454709795806,
-    "particle_weight": 33067341227104.625
   }
 }
\ No newline at end of file
diff --git a/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json b/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json
index 50971f0d45e..cfd031d6e33 100644
--- a/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json
+++ b/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json
@@ -1,24 +1,15 @@
 {
   "lev=0": {
-    "Bx": 115622.1878941125,
-    "By": 243403.66715242947,
-    "Bz": 63602.66529020351,
-    "Ex": 117118934931289.56,
-    "Ey": 18448377440588.27,
-    "Ez": 50821967818817.24,
-    "jx": 2.1044522674691452e+16,
-    "jy": 329314843111847.94,
-    "jz": 4524787623275627.0,
-    "rho": 22128883.53068064
-  },
-  "driverback": {
-    "particle_momentum_x": 4.813131349021332e+21,
-    "particle_momentum_y": 5.16548074090123e+21,
-    "particle_momentum_z": 3.005830430844926e+25,
-    "particle_position_x": 0.001649481123084974,
-    "particle_position_y": 0.0016172218745428432,
-    "particle_position_z": 0.4899808854005956,
-    "particle_weight": 6241509074.460762
+    "Bx": 115610.21497814235,
+    "By": 243019.564489834,
+    "Bz": 63397.3416561916,
+    "Ex": 117012138466922.22,
+    "Ey": 18429606525820.12,
+    "Ez": 50835997822445.34,
+    "jx": 2.1028213761477244e+16,
+    "jy": 326844980054897.7,
+    "jz": 4514643615865121.0,
+    "rho": 22084564.546177678
   },
   "beam": {
     "particle_momentum_x": 4.178482505909375e-19,
@@ -29,24 +20,33 @@
     "particle_position_z": 1.901942694291968,
     "particle_weight": 3120754537.230381
   },
-  "plasma_e": {
-    "particle_momentum_x": 1.9905288525315664e-19,
-    "particle_momentum_y": 1.2685401564810352e-20,
-    "particle_momentum_z": 2.6334746597885943e-17,
-    "particle_position_x": 0.4991702885212871,
-    "particle_position_y": 0.4991949978513417,
-    "particle_position_z": 0.4562491611716817,
+  "plasma_p": {
+    "particle_momentum_x": 1.9959818202810056e-19,
+    "particle_momentum_y": 2.9455107653405726e-21,
+    "particle_momentum_z": 4.82960013792663e-14,
+    "particle_position_x": 0.4991250027534606,
+    "particle_position_y": 0.49912499804419774,
+    "particle_position_z": 0.4563845471451087,
     "particle_weight": 33067341227104.625
   },
-  "plasma_p": {
-    "particle_momentum_x": 2.002897995377179e-19,
-    "particle_momentum_y": 2.87423099731012e-21,
-    "particle_momentum_z": 4.8296000849128737e-14,
-    "particle_position_x": 0.49912500259846493,
-    "particle_position_y": 0.4991249979476612,
-    "particle_position_z": 0.45638454712861487,
+  "plasma_e": {
+    "particle_momentum_x": 1.9841122555955512e-19,
+    "particle_momentum_y": 1.2475587913571367e-20,
+    "particle_momentum_z": 2.6334235362474606e-17,
+    "particle_position_x": 0.49916947686056645,
+    "particle_position_y": 0.49919374997004357,
+    "particle_position_z": 0.4562507922838501,
     "particle_weight": 33067341227104.625
   },
+  "driverback": {
+    "particle_momentum_x": 4.813131349021332e+21,
+    "particle_momentum_y": 5.16548074090123e+21,
+    "particle_momentum_z": 3.005830430844926e+25,
+    "particle_position_x": 0.001649481123084974,
+    "particle_position_y": 0.0016172218745428432,
+    "particle_position_z": 0.4899808854005956,
+    "particle_weight": 6241509074.460762
+  },
   "driver": {
     "particle_momentum_x": 4.700436405078562e+21,
     "particle_momentum_y": 4.6785862113093076e+21,
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
index f1fb5f4b0db..e4e5d7b8678 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 = 1f038e767011e20100af6ab0db02c69cf7ebe55c
+branch = 259db7cfb99e7d1d2ab4bec9b1587fdf624a138a
 
 [source]
 dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index f00fb083cbc..a18f39b89c1 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 = 1f038e767011e20100af6ab0db02c69cf7ebe55c
+branch = 259db7cfb99e7d1d2ab4bec9b1587fdf624a138a
 
 [source]
 dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
index 9f4cac71736..7fd419b54f8 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.cpp
@@ -36,7 +36,8 @@ HankelTransform::HankelTransform (int const hankel_order,
     //   SYCL note: we need to double check AMReX device ID conventions and
     //   BLAS++ device ID conventions are the same
     int const device_id = amrex::Gpu::Device::deviceId();
-    m_queue = std::make_unique<blas::Queue>( device_id, 0 );
+    blas::Queue::stream_t stream_id = amrex::Gpu::gpuStream();
+    m_queue = std::make_unique<blas::Queue>( device_id, stream_id );
 #endif
 
     amrex::Vector<amrex::Real> alphas;
diff --git a/Source/Initialization/VelocityProperties.cpp b/Source/Initialization/VelocityProperties.cpp
index 14b48c79524..b6986970e31 100644
--- a/Source/Initialization/VelocityProperties.cpp
+++ b/Source/Initialization/VelocityProperties.cpp
@@ -18,26 +18,25 @@ VelocityProperties::VelocityProperties (const amrex::ParmParse& pp, std::string
     std::string vel_dir_s = "x";
 
     utils::parser::query(pp, source_name, "bulk_vel_dir", vel_dir_s);
-    if(vel_dir_s[0] == '-'){
-        m_sign_dir = -1;
-    }
-    else {
-        m_sign_dir = 1;
+
+    if(vel_dir_s.empty()){
+        WARPX_ABORT_WITH_MESSAGE("'<s_name>.bulk_vel_dir input ' can't be empty.");
     }
 
-    if ((vel_dir_s == "x" || vel_dir_s[1] == 'x') ||
-       (vel_dir_s == "X" || vel_dir_s[1] == 'X')){
+    m_sign_dir = (vel_dir_s[0] == '-') ? -1 : 1;
+
+    const auto dir = std::tolower(vel_dir_s.back());
+
+    if (dir == 'x'){
         m_dir = 0;
     }
-    else if ((vel_dir_s == "y" || vel_dir_s[1] == 'y') ||
-               (vel_dir_s == "Y" || vel_dir_s[1] == 'Y')){
+    else if (dir == 'y'){
         m_dir = 1;
     }
-    else if ((vel_dir_s == "z" || vel_dir_s[1] == 'z') ||
-            (vel_dir_s == "Z" || vel_dir_s[1] == 'Z')) {
+    else if (dir == 'z'){
         m_dir = 2;
     }
-    else {
+    else{
         WARPX_ABORT_WITH_MESSAGE(
             "Cannot interpret <s_name>.bulk_vel_dir input '" + vel_dir_s +
             "'. Please enter +/- x, y, or z with no whitespace between the sign and"+
diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
index e407ae1603b..af4e6ba38c9 100644
--- a/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
+++ b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
@@ -58,7 +58,7 @@ void ElasticCollisionPerez (
     const T_index NI1 = I1e - I1s;
     const T_index NI2 = I2e - I2s;
     const T_index max_N = amrex::max(NI1,NI2);
-    const T_index min_N = amrex::max(NI1,NI2);
+    const T_index min_N = amrex::min(NI1,NI2);
 
     T_PR * const AMREX_RESTRICT w1 = soa_1.m_rdata[PIdx::w];
     T_PR * const AMREX_RESTRICT u1x = soa_1.m_rdata[PIdx::ux];
diff --git a/Source/Particles/ParticleBoundaryBuffer.cpp b/Source/Particles/ParticleBoundaryBuffer.cpp
index be6f9cd7826..7b2ebce92b9 100644
--- a/Source/Particles/ParticleBoundaryBuffer.cpp
+++ b/Source/Particles/ParticleBoundaryBuffer.cpp
@@ -390,7 +390,15 @@ void ParticleBoundaryBuffer::gatherParticlesFromDomainBoundaries (MultiParticleC
                     buffer[i].AddRealComp("ny", false);
                     buffer[i].AddRealComp("nz", false);
                 }
+
                 auto& species_buffer = buffer[i];
+                for (int lev = 0; lev < pc.numLevels(); ++lev){
+                    for(PIter pti(pc, lev); pti.isValid(); ++pti){
+                        species_buffer.DefineAndReturnParticleTile(
+                            lev, pti.index(), pti.LocalTileIndex());
+                    }
+                }
+
                 for (int lev = 0; lev < pc.numLevels(); ++lev)
                 {
                     for (PIter pti(pc, lev); pti.isValid(); ++pti) {
@@ -479,7 +487,15 @@ void ParticleBoundaryBuffer::gatherParticlesFromEmbeddedBoundaries (
             buffer[i].AddRealComp("nz", false);
 
         }
+
         auto& species_buffer = buffer[i];
+        for (int lev = 0; lev < pc.numLevels(); ++lev){
+            for(PIter pti(pc, lev); pti.isValid(); ++pti){
+                species_buffer.DefineAndReturnParticleTile(
+                    lev, pti.index(), pti.LocalTileIndex());
+            }
+        }
+
         for (int lev = 0; lev < pc.numLevels(); ++lev)
         {
             const auto& plevel = pc.GetParticles(lev);
diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index d1f9eb16f47..5e3380cc1a6 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -1284,8 +1284,16 @@ WarpX::ReadParameters ()
             }
         }
 
-        // Use same shape factors in all directions, for gathering
-        if (field_gathering_algo == GatheringAlgo::MomentumConserving) { galerkin_interpolation = false; }
+        // Use same shape factors in all directions
+        // - with momentum-conserving field gathering
+        if (field_gathering_algo == GatheringAlgo::MomentumConserving) {galerkin_interpolation = false;}
+        // - with direct current deposition and the EM solver
+        if( electromagnetic_solver_id != ElectromagneticSolverAlgo::None &&
+            electromagnetic_solver_id != ElectromagneticSolverAlgo::HybridPIC ) {
+            if (current_deposition_algo == CurrentDepositionAlgo::Direct) {
+                galerkin_interpolation = false;
+            }
+        }
 
         {
             const ParmParse pp_interpolation("interpolation");
diff --git a/Tools/machines/adastra-cines/adastra_warpx.profile.example b/Tools/machines/adastra-cines/adastra_warpx.profile.example
index 0d55e869d6a..3cba4346421 100644
--- a/Tools/machines/adastra-cines/adastra_warpx.profile.example
+++ b/Tools/machines/adastra-cines/adastra_warpx.profile.example
@@ -11,10 +11,10 @@ module load CCE-GPU-3.0.0
 module load amd-mixed/5.2.3
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SHAREDHOMEDIR}/sw/adastra/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for QED lookup table generation support
 module load boost/1.83.0-mpi-python3
diff --git a/Tools/machines/adastra-cines/install_dependencies.sh b/Tools/machines/adastra-cines/install_dependencies.sh
index b48bf144c2a..242f5fc664c 100755
--- a/Tools/machines/adastra-cines/install_dependencies.sh
+++ b/Tools/machines/adastra-cines/install_dependencies.sh
@@ -38,14 +38,13 @@ if [ -d $SHAREDHOMEDIR/src/blaspp ]
 then
   cd $SHAREDHOMEDIR/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $SHAREDHOMEDIR/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $SHAREDHOMEDIR/src/blaspp
 fi
 rm -rf $SHAREDHOMEDIR/src/blaspp-adastra-gpu-build
-CXX=$(which CC) cmake -S $SHAREDHOMEDIR/src/blaspp -B $SHAREDHOMEDIR/src/blaspp-adastra-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $SHAREDHOMEDIR/src/blaspp -B $SHAREDHOMEDIR/src/blaspp-adastra-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $SHAREDHOMEDIR/src/blaspp-adastra-gpu-build --target install --parallel 16
 rm -rf $SHAREDHOMEDIR/src/blaspp-adastra-gpu-build
 
@@ -54,14 +53,13 @@ if [ -d $SHAREDHOMEDIR/src/lapackpp ]
 then
   cd $SHAREDHOMEDIR/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $SHAREDHOMEDIR/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $SHAREDHOMEDIR/src/lapackpp
 fi
 rm -rf $SHAREDHOMEDIR/src/lapackpp-adastra-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $SHAREDHOMEDIR/src/lapackpp -B $SHAREDHOMEDIR/src/lapackpp-adastra-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $SHAREDHOMEDIR/src/lapackpp -B $SHAREDHOMEDIR/src/lapackpp-adastra-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $SHAREDHOMEDIR/src/lapackpp-adastra-gpu-build --target install --parallel 16
 rm -rf $SHAREDHOMEDIR/src/lapackpp-adastra-gpu-build
 
diff --git a/Tools/machines/cori-nersc/haswell_warpx.profile.example b/Tools/machines/cori-nersc/haswell_warpx.profile.example
index b0ac225cc72..f636b1ab555 100644
--- a/Tools/machines/cori-nersc/haswell_warpx.profile.example
+++ b/Tools/machines/cori-nersc/haswell_warpx.profile.example
@@ -8,8 +8,8 @@ module load cray-python/3.9.7.1
 export PKG_CONFIG_PATH=$FFTW_DIR/pkgconfig:$PKG_CONFIG_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/haswell/c-blosc-1.12.1-install:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/haswell/adios2-2.7.1-install:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/haswell/blaspp-master-install:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/haswell/lapackpp-master-install:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/haswell/blaspp-2024.05.31-install:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/haswell/lapackpp-2024.05.31-install:$CMAKE_PREFIX_PATH
 
 if [ -d "$HOME/sw/haswell/venvs/haswell_warpx" ]
 then
diff --git a/Tools/machines/cori-nersc/knl_warpx.profile.example b/Tools/machines/cori-nersc/knl_warpx.profile.example
index 093c7f62783..fdd7e14d594 100644
--- a/Tools/machines/cori-nersc/knl_warpx.profile.example
+++ b/Tools/machines/cori-nersc/knl_warpx.profile.example
@@ -9,8 +9,8 @@ module load cray-python/3.9.7.1
 export PKG_CONFIG_PATH=$FFTW_DIR/pkgconfig:$PKG_CONFIG_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/knl/c-blosc-1.12.1-install:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/knl/adios2-2.7.1-install:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/knl/blaspp-master-install:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/knl/lapackpp-master-install:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/knl/blaspp-2024.05.31-install:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/knl/lapackpp-2024.05.31-install:$CMAKE_PREFIX_PATH
 
 if [ -d "$HOME/sw/knl/venvs/knl_warpx" ]
 then
diff --git a/Tools/machines/crusher-olcf/crusher_warpx.profile.example b/Tools/machines/crusher-olcf/crusher_warpx.profile.example
index ffc70a128e2..7b05546b3f3 100644
--- a/Tools/machines/crusher-olcf/crusher_warpx.profile.example
+++ b/Tools/machines/crusher-olcf/crusher_warpx.profile.example
@@ -21,10 +21,10 @@ module load ninja
 module load nano
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${HOME}/sw/crusher/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${HOME}/sw/crusher/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/crusher/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/crusher/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/crusher/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/crusher/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/crusher/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/crusher/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for QED lookup table generation support
 module load boost/1.79.0-cxx17
diff --git a/Tools/machines/crusher-olcf/install_dependencies.sh b/Tools/machines/crusher-olcf/install_dependencies.sh
index ab5deb6b0a6..6e9f97eddae 100755
--- a/Tools/machines/crusher-olcf/install_dependencies.sh
+++ b/Tools/machines/crusher-olcf/install_dependencies.sh
@@ -49,14 +49,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-crusher-gpu-build
-CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-crusher-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-crusher-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $HOME/src/blaspp-crusher-gpu-build --target install --parallel 16
 rm -rf $HOME/src/blaspp-crusher-gpu-build
 
@@ -65,14 +64,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-crusher-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-crusher-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-crusher-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $HOME/src/lapackpp-crusher-gpu-build --target install --parallel 16
 rm -rf $HOME/src/lapackpp-crusher-gpu-build
 
diff --git a/Tools/machines/frontier-olcf/frontier_warpx.profile.example b/Tools/machines/frontier-olcf/frontier_warpx.profile.example
index 2f86d047d00..50e12e99a38 100644
--- a/Tools/machines/frontier-olcf/frontier_warpx.profile.example
+++ b/Tools/machines/frontier-olcf/frontier_warpx.profile.example
@@ -20,10 +20,10 @@ module load ninja
 module load nano
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${HOME}/sw/frontier/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${HOME}/sw/frontier/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/frontier/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/frontier/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/frontier/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/frontier/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/frontier/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/frontier/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for QED lookup table generation support
 module load boost/1.79.0-cxx17
diff --git a/Tools/machines/frontier-olcf/install_dependencies.sh b/Tools/machines/frontier-olcf/install_dependencies.sh
index 98c30cfca8f..503ab4525e9 100755
--- a/Tools/machines/frontier-olcf/install_dependencies.sh
+++ b/Tools/machines/frontier-olcf/install_dependencies.sh
@@ -49,14 +49,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-frontier-gpu-build
-CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-frontier-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-frontier-gpu-build -Duse_openmp=OFF -Dgpu_backend=hip -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $HOME/src/blaspp-frontier-gpu-build --target install --parallel 16
 rm -rf $HOME/src/blaspp-frontier-gpu-build
 
@@ -65,14 +64,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-frontier-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-frontier-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-frontier-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $HOME/src/lapackpp-frontier-gpu-build --target install --parallel 16
 rm -rf $HOME/src/lapackpp-frontier-gpu-build
 
diff --git a/Tools/machines/greatlakes-umich/greatlakes_v100_warpx.profile.example b/Tools/machines/greatlakes-umich/greatlakes_v100_warpx.profile.example
index 98476eecfab..c08255e7962 100644
--- a/Tools/machines/greatlakes-umich/greatlakes_v100_warpx.profile.example
+++ b/Tools/machines/greatlakes-umich/greatlakes_v100_warpx.profile.example
@@ -22,13 +22,13 @@ module load phdf5/1.12.1
 SW_DIR="${HOME}/sw/greatlakes/v100"
 export CMAKE_PREFIX_PATH=${SW_DIR}/c-blosc2-2.14.4:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${SW_DIR}/adios2-2.10.0:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=${SW_DIR}/c-blosc2-2.14.4/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${SW_DIR}/adios2-2.10.0/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 export PATH=${SW_DIR}/adios2-2.10.0/bin:${PATH}
 
diff --git a/Tools/machines/greatlakes-umich/install_v100_dependencies.sh b/Tools/machines/greatlakes-umich/install_v100_dependencies.sh
index 9361fd6c64b..30faec52421 100755
--- a/Tools/machines/greatlakes-umich/install_v100_dependencies.sh
+++ b/Tools/machines/greatlakes-umich/install_v100_dependencies.sh
@@ -80,14 +80,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-v100-build
-cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-v100-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-v100-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-v100-build --target install --parallel 8
 rm -rf ${build_dir}/blaspp-v100-build
 
@@ -96,14 +95,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-v100-build
-CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-v100-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-v100-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-v100-build --target install --parallel 8
 rm -rf ${build_dir}/lapackpp-v100-build
 
diff --git a/Tools/machines/hpc3-uci/hpc3_gpu_warpx.profile.example b/Tools/machines/hpc3-uci/hpc3_gpu_warpx.profile.example
index 9f41cc7e337..017613f9d60 100644
--- a/Tools/machines/hpc3-uci/hpc3_gpu_warpx.profile.example
+++ b/Tools/machines/hpc3-uci/hpc3_gpu_warpx.profile.example
@@ -19,13 +19,13 @@ module load OpenBLAS/0.3.21
 module load hdf5/1.13.1/gcc.11.2.0-openmpi.4.1.2
 export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/adios2-2.8.3:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${HOME}/sw/hpc3/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/c-blosc-1.21.1/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/adios2-2.8.3/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${HOME}/sw/hpc3/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 export PATH=${HOME}/sw/hpc3/gpu/adios2-2.8.3/bin:${PATH}
 
diff --git a/Tools/machines/hpc3-uci/install_gpu_dependencies.sh b/Tools/machines/hpc3-uci/install_gpu_dependencies.sh
index 51d4bcfe2c5..b585c2702b6 100755
--- a/Tools/machines/hpc3-uci/install_gpu_dependencies.sh
+++ b/Tools/machines/hpc3-uci/install_gpu_dependencies.sh
@@ -79,14 +79,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-pm-gpu-build
-cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $HOME/src/blaspp-pm-gpu-build --target install --parallel 8
 rm -rf $HOME/src/blaspp-pm-gpu-build
 
@@ -95,14 +94,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-pm-gpu-build
-CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $HOME/src/lapackpp-pm-gpu-build --target install --parallel 8
 rm -rf $HOME/src/lapackpp-pm-gpu-build
 
diff --git a/Tools/machines/lassen-llnl/install_v100_dependencies.sh b/Tools/machines/lassen-llnl/install_v100_dependencies.sh
index fe8285b7501..6368010ab7b 100755
--- a/Tools/machines/lassen-llnl/install_v100_dependencies.sh
+++ b/Tools/machines/lassen-llnl/install_v100_dependencies.sh
@@ -82,13 +82,12 @@ if [ -d ${SRC_DIR}/blaspp ]
 then
   cd ${SRC_DIR}/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp
 fi
-cmake -S ${SRC_DIR}/blaspp -B ${build_dir}/blaspp-lassen-build -Duse_openmp=ON -Dgpu_backend=cuda -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+cmake -S ${SRC_DIR}/blaspp -B ${build_dir}/blaspp-lassen-build -Duse_openmp=ON -Dgpu_backend=cuda -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-lassen-build --target install --parallel 10
 
 # LAPACK++ (for PSATD+RZ)
@@ -96,13 +95,12 @@ if [ -d ${SRC_DIR}/lapackpp ]
 then
   cd ${SRC_DIR}/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp
 fi
-CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${SRC_DIR}/lapackpp -B ${build_dir}/lapackpp-lassen-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master -DLAPACK_LIBRARIES=/usr/lib64/liblapack.so
+CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${SRC_DIR}/lapackpp -B ${build_dir}/lapackpp-lassen-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31 -DLAPACK_LIBRARIES=/usr/lib64/liblapack.so
 cmake --build ${build_dir}/lapackpp-lassen-build --target install --parallel 10
 
 
diff --git a/Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example b/Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example
index 4d4efbf917d..80755ece308 100644
--- a/Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example
+++ b/Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example
@@ -22,10 +22,10 @@ export PATH=${SW_DIR}/hdf5-1.14.1.2/bin:${PATH}
 export PATH=${SW_DIR}/adios2-2.8.3/bin:$PATH
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for Python bindings
 module load python/3.8.2
diff --git a/Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example b/Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example
index abad909943c..6a7067f596e 100644
--- a/Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example
+++ b/Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example
@@ -22,10 +22,10 @@ export PATH=${SW_DIR}/hdf5-1.14.1.2/bin:${PATH}
 export PATH=${SW_DIR}/adios2-2.8.3/bin:${PATH}
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for Python bindings
 module load python/3.8.2
diff --git a/Tools/machines/lawrencium-lbnl/lawrencium_warpx.profile.example b/Tools/machines/lawrencium-lbnl/lawrencium_warpx.profile.example
index 472d0785bb2..8db2b44b8a7 100644
--- a/Tools/machines/lawrencium-lbnl/lawrencium_warpx.profile.example
+++ b/Tools/machines/lawrencium-lbnl/lawrencium_warpx.profile.example
@@ -18,8 +18,8 @@ module load lapack/3.8.0-gcc
 
 export CMAKE_PREFIX_PATH=$HOME/sw/v100/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/v100/adios2-2.8.3:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/v100/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/v100/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/v100/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/v100/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 
 export PATH=$HOME/sw/v100/adios2-2.8.3/bin:$PATH
 
diff --git a/Tools/machines/leonardo-cineca/install_gpu_dependencies.sh b/Tools/machines/leonardo-cineca/install_gpu_dependencies.sh
index bbaf0ab8464..4d89e30cd29 100644
--- a/Tools/machines/leonardo-cineca/install_gpu_dependencies.sh
+++ b/Tools/machines/leonardo-cineca/install_gpu_dependencies.sh
@@ -48,14 +48,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-gpu-build
-CXX=$(which g++) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which g++) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $HOME/src/blaspp-gpu-build --target install --parallel 16
 rm -rf $HOME/src/blaspp-gpu-build
 
@@ -65,14 +64,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $HOME/src/lapackpp-gpu-build --target install --parallel 16
 rm -rf $HOME/src/lapackpp-gpu-build
 
diff --git a/Tools/machines/leonardo-cineca/leonardo_gpu_warpx.profile.example b/Tools/machines/leonardo-cineca/leonardo_gpu_warpx.profile.example
index cffe565f9d7..dd8e79ffb37 100644
--- a/Tools/machines/leonardo-cineca/leonardo_gpu_warpx.profile.example
+++ b/Tools/machines/leonardo-cineca/leonardo_gpu_warpx.profile.example
@@ -16,13 +16,13 @@ module load boost/1.80.0--openmpi--4.1.4--gcc--11.3.0
 module load openblas/0.3.21--gcc--11.3.0
 export CMAKE_PREFIX_PATH=/leonardo/prod/spack/03/install/0.19/linux-rhel8-icelake/gcc-11.3.0/c-blosc-1.21.1-aifmix6v5lwxgt7rigwoebalrgbcnv26:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=$HOME/sw/adios2-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=$HOME/sw/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=$HOME/sw/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=/leonardo/prod/spack/03/install/0.19/linux-rhel8-icelake/gcc-11.3.0/c-blosc-1.21.1-aifmix6v5lwxgt7rigwoebalrgbcnv26/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$HOME/sw/adios2-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$HOME/sw/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$HOME/sw/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$HOME/sw/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$HOME/sw/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 export PATH=$HOME/sw/adios2-master/bin:$PATH
 
diff --git a/Tools/machines/lumi-csc/install_dependencies.sh b/Tools/machines/lumi-csc/install_dependencies.sh
index 814e134bad4..2fd31b79bce 100755
--- a/Tools/machines/lumi-csc/install_dependencies.sh
+++ b/Tools/machines/lumi-csc/install_dependencies.sh
@@ -43,11 +43,10 @@ if [ -d ${SRC_DIR}/blaspp ]
 then
   cd ${SRC_DIR}/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp
 fi
 rm -rf ${build_dir}/blaspp-lumi-gpu-build
 CXX=$(which CC)                              \
@@ -56,7 +55,7 @@ cmake -S ${SRC_DIR}/blaspp                   \
       -Duse_openmp=OFF                       \
       -Dgpu_backend=hip                      \
       -DCMAKE_CXX_STANDARD=17                \
-      -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+      -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-lumi-gpu-build --target install --parallel 16
 rm -rf ${build_dir}/blaspp-lumi-gpu-build
 
@@ -65,11 +64,10 @@ if [ -d ${SRC_DIR}/lapackpp ]
 then
   cd ${SRC_DIR}/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp
 fi
 rm -rf ${build_dir}/lapackpp-lumi-gpu-build
 CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" \
@@ -78,7 +76,7 @@ cmake -S ${SRC_DIR}/lapackpp                     \
       -DCMAKE_CXX_STANDARD=17                    \
       -Dbuild_tests=OFF                          \
       -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON     \
-      -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+      -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-lumi-gpu-build --target install --parallel 16
 rm -rf ${build_dir}/lapackpp-lumi-gpu-build
 
diff --git a/Tools/machines/lumi-csc/lumi_warpx.profile.example b/Tools/machines/lumi-csc/lumi_warpx.profile.example
index 33aff1946c2..13fb6b1d81e 100644
--- a/Tools/machines/lumi-csc/lumi_warpx.profile.example
+++ b/Tools/machines/lumi-csc/lumi_warpx.profile.example
@@ -11,10 +11,10 @@ module load nano
 
 # optional: for PSATD in RZ geometry support
 SW_DIR="${HOME}/sw/lumi/gpu"
-export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for QED lookup table generation support
 module load Boost/1.82.0-cpeCray-23.09
diff --git a/Tools/machines/perlmutter-nersc/install_cpu_dependencies.sh b/Tools/machines/perlmutter-nersc/install_cpu_dependencies.sh
index e9ac393cd32..437300b8303 100755
--- a/Tools/machines/perlmutter-nersc/install_cpu_dependencies.sh
+++ b/Tools/machines/perlmutter-nersc/install_cpu_dependencies.sh
@@ -82,14 +82,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-pm-cpu-build
-CXX=$(which CC) cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-pm-cpu-build -Duse_openmp=ON -Dgpu_backend=OFF -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-pm-cpu-build -Duse_openmp=ON -Dgpu_backend=OFF -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-pm-cpu-build --target install --parallel 16
 rm -rf ${build_dir}/blaspp-pm-cpu-build
 
@@ -98,14 +97,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-pm-cpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-pm-cpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-pm-cpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-pm-cpu-build --target install --parallel 16
 rm -rf ${build_dir}/lapackpp-pm-cpu-build
 
diff --git a/Tools/machines/perlmutter-nersc/install_gpu_dependencies.sh b/Tools/machines/perlmutter-nersc/install_gpu_dependencies.sh
index 125c63104be..ac95ad9f3a0 100755
--- a/Tools/machines/perlmutter-nersc/install_gpu_dependencies.sh
+++ b/Tools/machines/perlmutter-nersc/install_gpu_dependencies.sh
@@ -82,14 +82,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-pm-gpu-build
-CXX=$(which CC) cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-pm-gpu-build --target install --parallel 16
 rm -rf ${build_dir}/blaspp-pm-gpu-build
 
@@ -98,14 +97,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-pm-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-pm-gpu-build --target install --parallel 16
 rm -rf ${build_dir}/lapackpp-pm-gpu-build
 
diff --git a/Tools/machines/perlmutter-nersc/perlmutter_cpu_warpx.profile.example b/Tools/machines/perlmutter-nersc/perlmutter_cpu_warpx.profile.example
index 3fea9b3aa39..94d598abf5b 100644
--- a/Tools/machines/perlmutter-nersc/perlmutter_cpu_warpx.profile.example
+++ b/Tools/machines/perlmutter-nersc/perlmutter_cpu_warpx.profile.example
@@ -17,14 +17,14 @@ export BOOST_ROOT=/global/common/software/spackecp/perlmutter/e4s-23.05/default/
 module load cray-hdf5-parallel/1.12.2.9
 export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/adios2-2.8.3:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/heffte-2.4.0:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/c-blosc-1.21.1/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/adios2-2.8.3/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/heffte-2.4.0/lib64:$LD_LIBRARY_PATH
 
 export PATH=${CFS}/${proj}/${USER}/sw/perlmutter/cpu/adios2-2.8.3/bin:${PATH}
diff --git a/Tools/machines/perlmutter-nersc/perlmutter_gpu_warpx.profile.example b/Tools/machines/perlmutter-nersc/perlmutter_gpu_warpx.profile.example
index 9e1465d6c02..da1d55964d1 100644
--- a/Tools/machines/perlmutter-nersc/perlmutter_gpu_warpx.profile.example
+++ b/Tools/machines/perlmutter-nersc/perlmutter_gpu_warpx.profile.example
@@ -21,14 +21,14 @@ export BOOST_ROOT=/global/common/software/spackecp/perlmutter/e4s-23.05/default/
 module load cray-hdf5-parallel/1.12.2.9
 export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/adios2-2.8.3:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/heffte-2.4.0:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/c-blosc-1.21.1/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/adios2-2.8.3/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/heffte-2.4.0/lib64:$LD_LIBRARY_PATH
 
 export PATH=${CFS}/${proj%_g}/${USER}/sw/perlmutter/gpu/adios2-2.8.3/bin:${PATH}
diff --git a/Tools/machines/polaris-alcf/install_gpu_dependencies.sh b/Tools/machines/polaris-alcf/install_gpu_dependencies.sh
index dbc66b2ffff..18f94e6fd3b 100755
--- a/Tools/machines/polaris-alcf/install_gpu_dependencies.sh
+++ b/Tools/machines/polaris-alcf/install_gpu_dependencies.sh
@@ -65,14 +65,13 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
 rm -rf $HOME/src/blaspp-pm-gpu-build
-CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+CXX=$(which CC) cmake -S $HOME/src/blaspp -B $HOME/src/blaspp-pm-gpu-build -Duse_openmp=OFF -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build $HOME/src/blaspp-pm-gpu-build --target install --parallel 16
 rm -rf $HOME/src/blaspp-pm-gpu-build
 
@@ -81,14 +80,13 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
 rm -rf $HOME/src/lapackpp-pm-gpu-build
-CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXX=$(which CC) CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S $HOME/src/lapackpp -B $HOME/src/lapackpp-pm-gpu-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build $HOME/src/lapackpp-pm-gpu-build --target install --parallel 16
 rm -rf $HOME/src/lapackpp-pm-gpu-build
 
diff --git a/Tools/machines/polaris-alcf/polaris_gpu_warpx.profile.example b/Tools/machines/polaris-alcf/polaris_gpu_warpx.profile.example
index d7635188141..333434c1b97 100644
--- a/Tools/machines/polaris-alcf/polaris_gpu_warpx.profile.example
+++ b/Tools/machines/polaris-alcf/polaris_gpu_warpx.profile.example
@@ -19,13 +19,13 @@ module load cmake/3.23.2
 module load cray-hdf5-parallel/1.12.2.3
 export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/adios2-2.8.3:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=/home/${USER}/sw/polaris/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
 
 export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/c-blosc-1.21.1/lib64:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/adios2-2.8.3/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/home/${USER}/sw/polaris/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 export PATH=/home/${USER}/sw/polaris/gpu/adios2-2.8.3/bin:${PATH}
 
diff --git a/Tools/machines/quartz-llnl/install_dependencies.sh b/Tools/machines/quartz-llnl/install_dependencies.sh
index 2920b00663b..cfb01769384 100755
--- a/Tools/machines/quartz-llnl/install_dependencies.sh
+++ b/Tools/machines/quartz-llnl/install_dependencies.sh
@@ -67,13 +67,12 @@ if [ -d ${HOME}/src/blaspp ]
 then
   cd ${HOME}/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git ${HOME}/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git ${HOME}/src/blaspp
 fi
-cmake -S ${HOME}/src/blaspp -B ${build_dir}/blaspp-quartz-build -Duse_openmp=ON -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+cmake -S ${HOME}/src/blaspp -B ${build_dir}/blaspp-quartz-build -Duse_openmp=ON -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-quartz-build --target install --parallel 6
 
 # LAPACK++ (for PSATD+RZ)
@@ -81,13 +80,12 @@ if [ -d ${HOME}/src/lapackpp ]
 then
   cd ${HOME}/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git ${HOME}/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git ${HOME}/src/lapackpp
 fi
-CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${HOME}/src/lapackpp -B ${build_dir}/lapackpp-quartz-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${HOME}/src/lapackpp -B ${build_dir}/lapackpp-quartz-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-quartz-build --target install --parallel 6
 
 
diff --git a/Tools/machines/quartz-llnl/quartz_warpx.profile.example b/Tools/machines/quartz-llnl/quartz_warpx.profile.example
index a3646bfd557..f296a0738ff 100644
--- a/Tools/machines/quartz-llnl/quartz_warpx.profile.example
+++ b/Tools/machines/quartz-llnl/quartz_warpx.profile.example
@@ -21,10 +21,10 @@ export CMAKE_PREFIX_PATH=${SW_DIR}/adios2-2.8.3:$CMAKE_PREFIX_PATH
 export PATH=${SW_DIR}/adios2-2.8.3/bin:${PATH}
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=${SW_DIR}/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for Python bindings
 module load python/3.9.12
diff --git a/Tools/machines/summit-olcf/install_gpu_dependencies.sh b/Tools/machines/summit-olcf/install_gpu_dependencies.sh
index 433b7ab0580..042e34538d0 100755
--- a/Tools/machines/summit-olcf/install_gpu_dependencies.sh
+++ b/Tools/machines/summit-olcf/install_gpu_dependencies.sh
@@ -63,13 +63,12 @@ if [ -d $HOME/src/blaspp ]
 then
   cd $HOME/src/blaspp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git $HOME/src/blaspp
 fi
-cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-summit-build -Duse_openmp=ON -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master
+cmake -S $HOME/src/blaspp -B ${build_dir}/blaspp-summit-build -Duse_openmp=ON -Dgpu_backend=cuda -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31
 cmake --build ${build_dir}/blaspp-summit-build --target install --parallel 10
 
 # LAPACK++ (for PSATD+RZ)
@@ -77,13 +76,12 @@ if [ -d $HOME/src/lapackpp ]
 then
   cd $HOME/src/lapackpp
   git fetch --prune
-  git checkout master
-  git pull
+  git checkout v2024.05.31
   cd -
 else
-  git clone https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
+  git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git $HOME/src/lapackpp
 fi
-cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-summit-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master
+cmake -S $HOME/src/lapackpp -B ${build_dir}/lapackpp-summit-build -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31
 cmake --build ${build_dir}/lapackpp-summit-build --target install --parallel 10
 
 # remove build temporary directory
diff --git a/Tools/machines/summit-olcf/summit_warpx.profile.example b/Tools/machines/summit-olcf/summit_warpx.profile.example
index e41521b5815..d70ee9eb42a 100644
--- a/Tools/machines/summit-olcf/summit_warpx.profile.example
+++ b/Tools/machines/summit-olcf/summit_warpx.profile.example
@@ -18,10 +18,10 @@ module load ccache
 module load ninja
 
 # optional: for PSATD in RZ geometry support
-export CMAKE_PREFIX_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/blaspp-master:$CMAKE_PREFIX_PATH
-export CMAKE_PREFIX_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/lapackpp-master:$CMAKE_PREFIX_PATH
-export LD_LIBRARY_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/blaspp-master/lib64:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/lapackpp-master/lib64:$LD_LIBRARY_PATH
+export CMAKE_PREFIX_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/blaspp-2024.05.31:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/lapackpp-2024.05.31:$CMAKE_PREFIX_PATH
+export LD_LIBRARY_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/blaspp-2024.05.31/lib64:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/ccs/proj/$proj/${USER}/sw/summit/gpu/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 
 # optional: for QED lookup table generation support
 module load boost/1.76.0
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index 30fe67bc018..632b9edd4f4 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -273,7 +273,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 "1f038e767011e20100af6ab0db02c69cf7ebe55c"
+set(WarpX_amrex_branch "259db7cfb99e7d1d2ab4bec9b1587fdf624a138a"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 
diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake
index 1016158fc4a..90aee6cb930 100644
--- a/cmake/dependencies/pyAMReX.cmake
+++ b/cmake/dependencies/pyAMReX.cmake
@@ -79,7 +79,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
 set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
     CACHE STRING
     "Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
-set(WarpX_pyamrex_branch "25e097f4ca10e0c5ad506041e56b7b2181d2f34a"
+set(WarpX_pyamrex_branch "fd7126cb907be7e3c8570930b79209db5cd7c492"
     CACHE STRING
     "Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
 
diff --git a/run_test.sh b/run_test.sh
index d590a710f4a..6ac22466ef0 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -68,7 +68,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 1f038e767011e20100af6ab0db02c69cf7ebe55c && cd -
+cd amrex && git checkout --detach 259db7cfb99e7d1d2ab4bec9b1587fdf624a138a && 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