diff --git a/scripts/setonix-cpu.profile b/scripts/setonix-cpu.profile
deleted file mode 100644
index 717de522e..000000000
--- a/scripts/setonix-cpu.profile
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-source /opt/cray/pe/cpe/23.03/restore_lmod_system_defaults.sh
-
-module load cmake/3.24.3
-module load cray-mpich
-module load cce/15.0.1
-module load cray-hdf5
-module load cray-python/3.9.13.1
-
-# GPU-aware MPI
-export MPICH_GPU_SUPPORT_ENABLED=0
-
-# compiler environment hints
-export CC=$(which cc)
-export CXX=$(which CC)
-export FC=$(which ftn)
-
diff --git a/scripts/setonix-gpu.profile b/scripts/setonix-gpu.profile
index d4b89564a..0de42452b 100644
--- a/scripts/setonix-gpu.profile
+++ b/scripts/setonix-gpu.profile
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-source /opt/cray/pe/cpe/23.03/restore_lmod_system_defaults.sh
-
-module load cmake/3.24.3
+#source /opt/cray/pe/cpe/23.09/restore_lmod_system_defaults.sh
+module load PrgEnv-cray
 module load craype-accel-amd-gfx90a
-module load rocm/5.2.3
 module load cray-mpich
-module load cce/15.0.1
+module load cce/16.0.1
+module load rocm/5.7.3
+
 module load cray-hdf5
 module load cray-python/3.9.13.1
+module load cmake/3.27.7
 
 # GPU-aware MPI
 export MPICH_GPU_SUPPORT_ENABLED=1
@@ -16,13 +17,10 @@ export MPICH_GPU_SUPPORT_ENABLED=1
 # optimize ROCm/HIP compilation for MI250X
 export AMREX_AMD_ARCH=gfx90a
 
-# allow CMake to find Ascent
-export Ascent_DIR=/software/projects/pawsey0807/bwibking/ascent_06082023/install/ascent-develop/lib/cmake/ascent/
-
 # compiler environment hints
 export CC=$(which cc)
 export CXX=$(which CC)
 export FC=$(which ftn)
 export CFLAGS="-I${ROCM_PATH}/include"
-export CXXFLAGS="-I${ROCM_PATH}/include"
+export CXXFLAGS="-I${ROCM_PATH}/include -mllvm -amdgpu-function-calls=true"
 
diff --git a/src/ShockCloud/cloud.cpp b/src/ShockCloud/cloud.cpp
index 3e6c3a277..c915e8e6c 100644
--- a/src/ShockCloud/cloud.cpp
+++ b/src/ShockCloud/cloud.cpp
@@ -58,9 +58,7 @@ template <> struct quokka::EOS_Traits<ShockCloud> {
 	static constexpr double boltzmann_constant = C::k_B;
 };
 
-// global variables
-namespace
-{
+/// global variables
 // Problem properties (set inside problem_main())
 bool sharp_cloud_edge = false; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 bool do_frame_shift = true;    // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -78,7 +76,6 @@ AMREX_GPU_MANAGED Real rho_wind = 0;		// NOLINT(cppcoreguidelines-avoid-non-cons
 AMREX_GPU_MANAGED Real v_wind = 0;		// NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 AMREX_GPU_MANAGED Real P_wind = 0;		// NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 AMREX_GPU_MANAGED Real delta_vx = 0;		// NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-} // namespace
 
 template <> void RadhydroSimulation<ShockCloud>::setInitialConditionsOnGrid(quokka::grid grid)
 {