diff --git a/.gitignore b/.gitignore
index eacba71..1a0d635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,6 @@ cython_debug/
 #.idea/
 
 .*.sw?
+
+# singulatity images
+*.sif
diff --git a/README.md b/README.md
index cf168c7..f4d11aa 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,12 @@ network access and a build stage without network access
 
 See [site/nci/README.md](site/nci/README.md)
 
+### Pawsey
+
+Build the environment at Pawsey Setonix
+
+See [site/pawsey/README.md](site/pawsey/README.md)
+
 ## Environments
 
 ### LFRic
diff --git a/environments/lfric/etc/env.activate.sh b/environments/lfric/etc/env.activate.sh
index 0173c24..59feca0 100644
--- a/environments/lfric/etc/env.activate.sh
+++ b/environments/lfric/etc/env.activate.sh
@@ -3,9 +3,14 @@
 SPACK_ENV_VIEW=$SPACK_ENV/.spack-env/view
 
 export FCM_KEYWORDS=${FCM_KEYWORDS:-$NGMOENVS_ENVDIR/etc/fcm-keyword.cfg}
-export LDMPI=mpifort
 export FPP="cpp -traditional"
 export FFLAGS="${FFLAGS:-} -I$SPACK_ENV_VIEW/include -I$SPACK_ENV_VIEW/lib"
+export LDFLAGS="-L$SPACK_ENV_VIEW/lib"
 export PFUNIT=$SPACK_ENV_VIEW
-export LIBRARY_PATH=$SPACK_ENV_VIEW/lib:$LIBRARY_PATH
 
+# Handle Cray linking with ftn rather than mpifort
+if [[ "$(basename "$FC")" == "ftn" ]]; then
+    export LDMPI=$FC
+else
+    export LDMPI=mpifort
+fi
diff --git a/environments/lfric/spack.yaml b/environments/lfric/spack.yaml
index ed67c7b..8b64968 100644
--- a/environments/lfric/spack.yaml
+++ b/environments/lfric/spack.yaml
@@ -3,7 +3,7 @@ spack:
     - xios@2.5.2629 +lfric
     - yaxt@0.11.3 idxtype=long
     - pfunit@3 max_array_rank=6 +mpi +openmp
-    - tau +mpi +openmp +opari ~pthreads +lfric
+    # - tau +mpi +openmp +opari ~pthreads +lfric
     - fcm
     - rsync
     - python@3.10
diff --git a/site/pawsey/README.md b/site/pawsey/README.md
new file mode 100644
index 0000000..7f1e5ec
--- /dev/null
+++ b/site/pawsey/README.md
@@ -0,0 +1,48 @@
+# Pawsey Setonix Containers
+
+Containers are built similar to the apptainer site, but in two stages. The
+first stage runs in 'copyq' which has internet access, the second stage runs on
+the compute nodes for faster builds.
+
+Pawsey containers make use of Pawsey's pre-installed compilers and MPI. Images are not
+portable to other sites, for portable images use the `apptainer` site directory.
+
+## Building the environment
+
+A container can be built with
+
+```bash
+# Install an environment
+./site/pawsey/install.sh lfric
+```
+
+## Using environments
+
+By default the environments will be installed into
+`/scratch/$PAWSEY_PROJECT/$USER/ngmo-envs/envs/$ENVIRONMENT/$BRANCH`.
+
+Make sure the environment's `bin/` directory is on your `PATH`, e.g.
+by loading the module:
+
+```bash
+module use /scratch/$PAWSEY_PROJECT/$USER/ngmo-envs/modules
+module load lfric
+```
+
+Run commands inside the container using the `envrun` script. If you build an
+executable inside the container you must also run it inside the container.
+
+```
+envrun make
+envrun mpirun -n 6 lfric
+```
+
+A script `envrun-wrapped` is also provided, this can be symlinked to other
+names to run the named command inside the environment:
+
+```
+ln -s /scratch/$PAWSEY_PROJECT/$USER/ngmo-envs/envs/lfric/master/bin/{envrun-wrapped,python}
+
+# Now `python` will get run inside the environment
+python
+```
diff --git a/site/pawsey/baseimage/Dockerfile b/site/pawsey/baseimage/Dockerfile
new file mode 100644
index 0000000..947741e
--- /dev/null
+++ b/site/pawsey/baseimage/Dockerfile
@@ -0,0 +1,38 @@
+FROM opensuse/leap:15
+
+# Setup default linker search paths
+COPY pawsey-ld.conf /etc/ld.so.conf.d/pawsey-ld.conf
+
+RUN zypper --non-interactive install \
+             bzip2 \
+             curl \
+             diffutils \
+             file \
+             findutils \
+             gcc \
+             gcc-c++ \
+             gcc-fortran \
+             git \
+             gzip \
+             libatomic1 \
+             libtool \
+             libgfortran5 \
+             lua53 \
+             lua53-luaposix \
+             lua53-luasocket \
+             make \
+             openssl \
+             patch \
+             subversion \
+             tar \
+             tcl \
+             time \
+             unzip \
+             wget \
+             which \
+             xz \
+             xz-devel \
+             zstd \
+    && zypper clean
+
+ENTRYPOINT ["/ngmo/bin/entrypoint.sh"]
diff --git a/site/pawsey/baseimage/README.md b/site/pawsey/baseimage/README.md
new file mode 100644
index 0000000..ca34ea0
--- /dev/null
+++ b/site/pawsey/baseimage/README.md
@@ -0,0 +1,10 @@
+NCI Apptainer base image
+========================
+
+Apptainer containers can't be built directly at NCI, this requires root
+privileges. Instead we create a base image using Docker, then convert that base
+image to apptainer format.
+
+Environment containers are created as squashfs overlays on top of this base
+image, these are inserted into the base image as part of the install process so
+the end result is a single container file.
diff --git a/site/pawsey/baseimage/build.sh b/site/pawsey/baseimage/build.sh
new file mode 100755
index 0000000..54ce7ad
--- /dev/null
+++ b/site/pawsey/baseimage/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker build --tag ngmoenvs-baseimage:latest .
+
+apptainer build ngmoenvs-baseimage.sif docker-daemon:ngmoenvs-baseimage:latest
diff --git a/site/pawsey/baseimage/pawsey-ld.conf b/site/pawsey/baseimage/pawsey-ld.conf
new file mode 100644
index 0000000..b99df82
--- /dev/null
+++ b/site/pawsey/baseimage/pawsey-ld.conf
@@ -0,0 +1,9 @@
+/opt/rocm-5.7.1/lib
+/opt/amdgpu/lib64
+/opt/amdgpu/lib
+/opt/rocm/lib
+/opt/cray/pe/lib64
+/opt/cray/pe/lib64/cce
+/opt/cray/xpmem/default/lib64
+/opt/esmi/e_smi/lib/
+/host/lib64
diff --git a/site/pawsey/bootstrap.sh b/site/pawsey/bootstrap.sh
new file mode 100755
index 0000000..e7080ee
--- /dev/null
+++ b/site/pawsey/bootstrap.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# Set up Pawsey Setonix to build environments
+
+set -eu
+set -o pipefail
+SCRIPT_DIR=$( cd -- "$( dirname -- "$(readlink -f "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )
+
+: "${NGMOENVS_BASEDIR:="/scratch/$PAWSEY_PROJECT/$USER/ngmo-envs"}"
+export NGMOENVS_BASEDIR
+
+# Cache paths
+: "${NGMOENVS_SPACK_MIRROR:="file://$NGMOENVS_BASEDIR/spack-mirror"}"
+: "${CONDA_BLD_PATH:="$NGMOENVS_BASEDIR/conda-bld"}"
+export NGMOENVS_SPACK_MIRROR
+export CONDA_BLD_PATH
+
+# Run the common bootstrap to install conda and spack
+"$SCRIPT_DIR/../../utils/bootstrap.sh"
+
+# Load up spack
+source "$NGMOENVS_BASEDIR/bin/activate"
+
+# Configure spack
+spack config --scope=site add -f "$SCRIPT_DIR/spack-packages.yaml"
+spack config --scope=site add -f "$SCRIPT_DIR/spack-compilers.yaml"
diff --git a/site/pawsey/entrypoint.sh b/site/pawsey/entrypoint.sh
new file mode 100644
index 0000000..bf98a20
--- /dev/null
+++ b/site/pawsey/entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Isolate Spack
+export SPACK_DISABLE_LOCAL_CONFIG=true
+
+# These variables are set during the install process
+NGMOENVS_CONTAINER_BASEDIR=''
+NGMOENVS_ENVIRONMENT=''
+
+# Add host and cce libraries as a fallback
+#export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/cray/pe/lib64:/opt/cray/pe/lib64/cce:/host/lib64"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64:/host/lib64"
+
+# Activate the base environment
+if [[ -f "$NGMOENVS_CONTAINER_BASEDIR/bin/activate" ]]; then
+    source "$NGMOENVS_CONTAINER_BASEDIR/bin/activate"
+fi
+
+# Activate the actual environment
+if [[ -f "$NGMOENVS_CONTAINER_BASEDIR/env/bin/activate" ]]; then
+    source "$NGMOENVS_CONTAINER_BASEDIR/env/bin/activate" 
+fi
+
+# Run the given command
+exec "$@"
diff --git a/site/pawsey/envrun b/site/pawsey/envrun
new file mode 100644
index 0000000..6f9cf27
--- /dev/null
+++ b/site/pawsey/envrun
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+ENV_DIR=$( cd -- "$( dirname -- "$(readlink -f "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )/..
+
+# Arguments to apptainer
+export MOUNT_ARGS=(
+    "--bind" "/opt/AMD" # AOCC compiler
+    "--bind" "/usr/lib64:/host/lib64" # System libraries
+)
+
+# GPG-agent socket
+if [[ -d "/run/user/$UID" ]]; then
+    MOUNT_ARGS+=(--bind "/run/user/$UID")
+fi
+
+# Used by srun on the queue
+if [[ -d /var/spool/slurmd ]]; then
+    MOUNT_ARGS+=(--bind /var/spool/slurmd)
+fi
+
+module load "singularity/4.1.0-slurm"
+
+singularity run "${MOUNT_ARGS[@]}" "$ENV_DIR/etc/image.sif" "$@"
diff --git a/site/pawsey/install-container.sh b/site/pawsey/install-container.sh
new file mode 100644
index 0000000..1c82758
--- /dev/null
+++ b/site/pawsey/install-container.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+# Build the container
+source "$NGMOENVS_DEFS/utils/common.sh"
+
+# Where we'll set up squashfs within the container
+export CONTAINER_BASEDIR="/ngmo"
+
+# Set variables inside the container
+export NGMOENVS_BASEDIR="$CONTAINER_BASEDIR"
+export NGMOENVS_ENVDIR="$CONTAINER_BASEDIR/env"
+export SPACK_BOOTSTRAP_ROOT="$CONTAINER_BASEDIR/spack-bootstrap"
+
+# Arguments to apptainer
+export MOUNT_ARGS=(
+    "--bind" "$LOCAL_SQUASHFS$CONTAINER_BASEDIR:$CONTAINER_BASEDIR:rw"
+    "--bind" "/opt/AMD" # AOCC compiler
+    "--bind" "/opt/rocm-5.7.1" # ROCM/clang compiler
+    "--bind" "/usr/lib64:/host/lib64" # System libraries
+    "--bind" "/run/user/$UID" # gpgagent sockets
+)
+
+# Set up squashfs directory
+mkdir -p "$LOCAL_SQUASHFS$CONTAINER_BASEDIR/bin"
+
+# Set up entrypoint
+sed "$SITE_DIR/entrypoint.sh" \
+    -e "s|^\(NGMOENVS_CONTAINER_BASEDIR\)=.*|\1='$CONTAINER_BASEDIR'|" \
+    -e "s|^\(NGMOENVS_ENVIRONMENT\)=.*|\1='$ENVIRONMENT'|" \
+    > "$LOCAL_SQUASHFS$CONTAINER_BASEDIR/bin/entrypoint.sh"
+chmod +x "$LOCAL_SQUASHFS$CONTAINER_BASEDIR/bin/entrypoint.sh"
+
+# Bootstrap container
+e singularity run "${MOUNT_ARGS[@]}" "$IMAGE" /bin/bash "$NGMOENVS_DEFS/utils/bootstrap.sh"
+
+# Configure site
+e singularity run "${MOUNT_ARGS[@]}" "$IMAGE" spack config --scope=site add -f "$SITE_DIR/spack-packages.yaml"
+e singularity run "${MOUNT_ARGS[@]}" "$IMAGE" spack config --scope=site add -f "$SITE_DIR/spack-compilers.yaml"
+
+# Install container environment
+e singularity run "${MOUNT_ARGS[@]}" "$IMAGE" /bin/bash "$NGMOENVS_DEFS/utils/install-stage-one.sh"
+
+if [[ "${NGMOENVS_COMPILER%@*}" == cce ]]; then
+    # Set compiler variables 
+    cat >> "$LOCAL_SQUASHFS$NGMOENVS_ENVDIR/bin/activate" <<EOF
+
+# Load Cray PE
+module load PrgEnv-cray
+module load craype-x86-milan
+module load craype-network-ofi
+
+module load cce/18.0.1
+module load cray-mpich/8.1.28
+module load cray-hdf5-parallel/1.12.2.9
+module load cray-netcdf-hdf5parallel/4.9.0.9
+
+export PKG_CONFIG_PATH=/opt/cray/xpmem/2.8.4-1.0_7.23__ga37cbd9.shasta/lib64/pkgconfig:\$PKG_CONFIG_PATH
+export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/cray/pe/lib64:/opt/cray/pe/lib64/cce
+EOF
+fi
+
+if [[ "${NGMOENVS_COMPILER%@*}" == gcc ]]; then
+    # Set compiler variables 
+    cat >> "$LOCAL_SQUASHFS$NGMOENVS_ENVDIR/bin/activate" <<EOF
+
+# Load Cray PE
+module load PrgEnv-gnu
+module load craype-x86-milan
+module load craype-network-ofi
+
+module load gcc/12.2.0
+module load cray-mpich/8.1.27
+module load cray-hdf5-parallel/1.12.2.7
+module load cray-netcdf-hdf5parallel/4.9.0.7
+
+export PKG_CONFIG_PATH=/opt/cray/xpmem/2.8.4-1.0_7.23__ga37cbd9.shasta/lib64/pkgconfig:\$PKG_CONFIG_PATH
+export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/cray/pe/lib64:/opt/cray/pe/lib64/cce
+EOF
+fi
+
diff --git a/site/pawsey/install.sh b/site/pawsey/install.sh
new file mode 100755
index 0000000..086eef0
--- /dev/null
+++ b/site/pawsey/install.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+# Install ngmo-environments on Pawsey Setonix
+
+set -eu
+set -o pipefail
+
+SITE_DIR=$( cd -- "$( dirname -- "$(readlink -f "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )
+export SITE_DIR
+
+# Base environments directory
+export NGMOENVS_DEFS="$SITE_DIR/../.."
+
+module purge
+module load "pawsey"
+module load "pawseyenv/2024.05"
+module load "singularity/4.1.0-slurm"
+source "$NGMOENVS_DEFS/utils/common.sh"
+
+export ENVIRONMENT="$1"
+
+: "${NGMOENVS_BASEDIR:="/scratch/$PAWSEY_PROJECT/$USER/ngmo-envs"}"
+export NGMOENVS_BASEDIR
+
+# Cache paths
+: "${NGMOENVS_SPACK_MIRROR:="file://$NGMOENVS_BASEDIR/spack-mirror"}"
+: "${CONDA_BLD_PATH:="$NGMOENVS_BASEDIR/conda-bld"}"
+export NGMOENVS_SPACK_MIRROR
+export CONDA_BLD_PATH
+
+# Default compiler and MPI
+: "${NGMOENVS_COMPILER:="cce"}"
+: "${NGMOENVS_MPI:="cray-mpich"}"
+export NGMOENVS_COMPILER NGMOENVS_MPI
+
+# Base image
+: "${NGMOENVS_BASEIMAGE:="$HOME/ngmoenvs-baseimage.sif"}"
+
+# Directory we'll install the container to
+: "${NGMOENVS_ENVDIR:="$NGMOENVS_BASEDIR/envs/$ENVIRONMENT/$VERSION"}"
+
+# Path for modulefiles
+: "${NGMOENVS_MODULE_ROOT:="$NGMOENVS_BASEDIR/modules"}"
+
+# Where we'll set up squashfs on the host machine
+export LOCAL_SQUASHFS="$NGMOENVS_ENVDIR/squashfs"
+
+# Start clean
+[[ -f "$NGMOENVS_ENVDIR" ]] && rm -r "$NGMOENVS_ENVDIR"
+
+mkdir -p "$NGMOENVS_ENVDIR"/{bin,etc}
+
+# Set up the image
+export IMAGE="$NGMOENVS_ENVDIR/etc/image.sif"
+cp "$NGMOENVS_BASEIMAGE" "$IMAGE"
+
+# Set temp dir
+export NGMOENVS_TMPDIR=/scratch/$PAWSEY_PROJECT/$USER/tmp
+
+# Build the container
+bash "$SITE_DIR/install-container.sh"
+
+# Convert to squashfs
+SQUASHFS="$NGMOENVS_ENVDIR/etc/env.squashfs"
+e mksquashfs "$LOCAL_SQUASHFS" "$SQUASHFS" -all-root -noappend -processors 2
+
+# Install into the container
+e singularity sif add \
+	--datatype 4 \
+	--partfs 1 \
+	--parttype 4 \
+	--partarch 2 \
+	--groupid 1 \
+	"$IMAGE" \
+	"$SQUASHFS"
+
+# Clean up temp squashfs
+e rm "$SQUASHFS"
+e rm -r "$LOCAL_SQUASHFS"
+
+# Set up scripts
+for SCRIPT in envrun; do
+    cp "$SITE_DIR/$SCRIPT" "$NGMOENVS_ENVDIR/bin/$SCRIPT"
+    chmod +x "$NGMOENVS_ENVDIR/bin/$SCRIPT"
+done
+
+NGMOENVS_MODULE="$NGMOENVS_MODULE_ROOT/$ENVIRONMENT/$VERSION"
+mkdir -p "$(dirname "$NGMOENVS_MODULE")"
+cat > "$NGMOENVS_MODULE" << EOF
+#%Module1.0
+
+set name         "$ENVIRONMENT"
+set version      "$VERSION"
+set origin       "$(git remote get-url origin) $(git rev-parse HEAD)"
+set install_date "$(date --iso=minute)"
+set installed_by "$USER - $(getent passwd "$USER" | cut -d ':' -f 5)"
+set prefix       "$NGMOENVS_ENVDIR"
+
+proc ModulesHelp {} {
+    global name version origin install_date installed_by
+
+    puts stderr "NGMO Environment \$name/\$version"
+    puts stderr "  Install info:"
+    puts stderr "    repo: \$origin"
+    puts stderr "    ver:  \$version"
+    puts stderr "    date: \$install_date"
+    puts stderr "    by:   \$installed_by"
+}
+
+set name_upcase [string toupper [string map {- _} \$name]]
+
+setenv \${name_upcase}_ROOT "\$prefix"
+setenv \${name_upcase}_VERSION "\$version"
+
+prepend-path PATH "\$prefix/bin"
+EOF
+
+cat <<EOF
+
+Environment for Pawsey-Setonix installed under
+
+    $NGMOENVS_ENVDIR
+
+Load as a module with
+
+    module use "$NGMOENVS_MODULE_ROOT"
+    module load "$ENVIRONMENT/$VERSION"
+
+Run commands in the environment with
+
+    envrun COMMAND
+
+EOF
diff --git a/site/pawsey/spack-compilers.yaml b/site/pawsey/spack-compilers.yaml
new file mode 100644
index 0000000..90d9b6f
--- /dev/null
+++ b/site/pawsey/spack-compilers.yaml
@@ -0,0 +1,41 @@
+compilers:
+  - compiler:
+      spec: cce@18.0.1
+      paths:
+        cc:  /opt/cray/pe/craype/2.7.23/bin/cc
+        cxx: /opt/cray/pe/craype/2.7.23/bin/CC
+        f77: /opt/cray/pe/craype/2.7.23/bin/ftn
+        fc:  /opt/cray/pe/craype/2.7.23/bin/ftn
+      flags: {}
+      operating_system: opensuse15
+      target: x86_64
+      modules:
+        - PrgEnv-cray
+        - cce/18.0.1
+        - craype-x86-milan
+      environment:
+        append_path:
+          LD_LIBRARY_PATH: /usr/lib64:/host/lib64
+      extra_rpaths:
+        - /opt/cray/pe/lib64/cce
+        - /opt/cray/pe/lib64
+  - compiler:
+      spec: gcc@12.2.0
+      paths:
+        cc:  /opt/cray/pe/craype/2.7.23/bin/cc
+        cxx: /opt/cray/pe/craype/2.7.23/bin/CC
+        f77: /opt/cray/pe/craype/2.7.23/bin/ftn
+        fc:  /opt/cray/pe/craype/2.7.23/bin/ftn
+      flags: {}
+      operating_system: opensuse15
+      target: x86_64
+      modules:
+        - PrgEnv-gnu
+        - gcc/12.2.0
+        - craype-x86-milan
+      environment:
+        append_path:
+          LD_LIBRARY_PATH: /usr/lib64:/host/lib64
+      extra_rpaths:
+        - /opt/cray/pe/lib64/cce
+        - /opt/cray/pe/lib64
diff --git a/site/pawsey/spack-packages.yaml b/site/pawsey/spack-packages.yaml
new file mode 100644
index 0000000..5c2a926
--- /dev/null
+++ b/site/pawsey/spack-packages.yaml
@@ -0,0 +1,99 @@
+packages:
+  gcc:
+    buildable: False
+  cce:
+    buildable: False
+  
+  cray-mpich:
+    buildable: False
+    externals:
+      - spec:   "cray-mpich@8.1.28 %cce@18"
+        prefix: "/opt/cray/pe/mpich/8.1.28/ofi/crayclang/17.0"
+        modules: 
+          - cray-mpich/8.1.28
+        extra_attributes:
+          environment:
+            append_path:
+              LD_LIBRARY_PATH: /opt/cray/libfabric/1.15.2.0/lib64
+      - spec:   "cray-mpich@8.1.27 %gcc"
+        prefix: "/opt/cray/pe/mpich/8.1.27/ofi/gnu/9.1"
+        modules: 
+          - cray-mpich/8.1.27
+        extra_attributes:
+          environment:
+            append_path:
+              LD_LIBRARY_PATH: /opt/cray/libfabric/1.15.2.0/lib64
+
+  netcdf-c:
+    buildable: False
+    require: "+mpi"
+    externals:
+      - spec:   "netcdf-c@4.9.0 +mpi +parallel-netcdf %cce"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/crayclang/17.0
+      - spec:   "netcdf-c@4.9.0 +mpi +parallel-netcdf %gcc"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.7/gnu/9.1
+
+  netcdf-fortran:
+    buildable: False
+    externals:
+      - spec:   "netcdf-fortran@4.5.3 %cce"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/crayclang/17.0
+      - spec:   "netcdf-fortran@4.5.3 %gcc"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.7/gnu/9.1
+
+  netcdf-cxx4:
+    buildable: False
+    externals:
+      - spec:   "netcdf-cxx4@4.3.1 %cce"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.9/crayclang/17.0
+      - spec:   "netcdf-cxx4@4.3.1 %gcc"
+        prefix: /opt/cray/pe/netcdf-hdf5parallel/4.9.0.7/gnu/9.1
+
+  hdf5:
+    buildable: False
+    externals:
+      - spec:   "hdf5@1.12.2 +fortran +mpi %cce"
+        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.9/crayclang/17.0
+      - spec:   "hdf5@1.12.2 +fortran +mpi %gcc"
+        prefix: /opt/cray/pe/hdf5-parallel/1.12.2.7/gnu/9.1
+
+  # Errors building with Cray
+  papi:
+    require:
+      - "%gcc"
+
+  libelf:
+    require:
+      - "%gcc"
+
+  serf:
+    # Scons doesn't play with Cray environments
+    require:
+      - "%gcc@7"
+
+  subversion:
+    buildable: False
+    externals:
+      - spec: "subversion@1.14.1"
+        prefix: /dev/null
+
+  tar:
+    require:
+      - "%gcc"
+
+  libxml2:
+    require:
+      - "%gcc"
+
+  ncurses:
+    require:
+      - "%gcc"
+
+  libxcrypt:
+    require:
+      - "%gcc"
+
+  zlib-ng:
+    require:
+      - "%gcc"
+
diff --git a/spack/packages/blitz/llvm_compiler_specific_header.patch b/spack/packages/blitz/llvm_compiler_specific_header.patch
index 647ac54..c692712 100644
--- a/spack/packages/blitz/llvm_compiler_specific_header.patch
+++ b/spack/packages/blitz/llvm_compiler_specific_header.patch
@@ -1,12 +1,14 @@
 diff -Nur spack-src.org/m4/ac_compiler_specific_header.m4 spack-src/m4/ac_compiler_specific_header.m4
 --- spack-src.org/m4/ac_compiler_specific_header.m4	2019-10-02 07:50:17.000000000 +0900
 +++ spack-src/m4/ac_compiler_specific_header.m4	2023-05-25 15:13:06.000000000 +0900
-@@ -21,7 +21,8 @@
+@@ -21,7 +21,10 @@
                                        [COMPILER_VENDOR="gnu"])],
    [*KCC*],        [COMPILER_VENDOR="kai"],
    [*pgCC*],       [COMPILER_VENDOR="pgi"],
  dnl  [*FCC*],        [COMPILER_VENDOR="fujitsu"],
 +  [*icpx*|*icx*],        [COMPILER_VENDOR="llvm"],
++  [*craycc*|*crayCC*],   [COMPILER_VENDOR="llvm"],
++  [*cc*|*CC*],   [COMPILER_VENDOR="llvm"],
    [*pathCC*],     [COMPILER_VENDOR="pathscale"],
    [*CC*],         [AS_CASE([$target],
                        [*sgi*],      [COMPILER_VENDOR="sgi"],
diff --git a/spack/packages/blitz/package.py b/spack/packages/blitz/package.py
index b053e60..1a13a5f 100644
--- a/spack/packages/blitz/package.py
+++ b/spack/packages/blitz/package.py
@@ -26,7 +26,7 @@ class Blitz(AutotoolsPackage):
     patch("fujitsu_compiler_specfic_header.patch", when="%fj")
 
     # Fix makefile and include to build with llvm compiler
-    patch("llvm_compiler_specific_header.patch", when="%oneapi")
+    patch("llvm_compiler_specific_header.patch")
     force_autoreconf = True
 
     build_targets = ["lib"]
diff --git a/spack/packages/xios/package.py b/spack/packages/xios/package.py
index 09366e1..b895246 100644
--- a/spack/packages/xios/package.py
+++ b/spack/packages/xios/package.py
@@ -52,7 +52,7 @@ class Xios(Package):
     patch("llvm_bug_17782.patch", when="@1.1: %clang")
 
     # Fix for recent gcc
-    patch("gcc_remap.patch", when="@2.5.2252")
+    #patch("gcc_remap.patch", when="@2.5.2252")
 
     # NEMO-specific patches from https://github.com/hiker/xios-2252/tree/master/patches
     patch("nemo/p1_add_refname", when="+nemo")
@@ -195,6 +195,7 @@ def xios_fcm(self):
 %LINKER         {MPIFC}
 
 %BASE_CFLAGS    -DMPICH_SKIP_MPICXX -h msglevel_4 -h zero -h gnu \
+                -std=c++11 \
                 -I{BOOST_INC_DIR} -I{BLITZ_INC_DIR}
 %PROD_CFLAGS    {CC_OPT_PROD} -DBOOST_DISABLE_ASSERTS
 %DEV_CFLAGS     {CC_OPT_DEV}
@@ -206,10 +207,10 @@ def xios_fcm(self):
 %DEBUG_FFLAGS   -g
 
 %BASE_INC       -D__NONE__
-%BASE_LD        -D__NONE__ -L{BOOST_LIB_DIR} -L{BLITZ_LIB_DIR} -lblitz
+%BASE_LD        -D__NONE__ -L{BOOST_LIB_DIR} -L{BLITZ_LIB_DIR} -lblitz {LIBCXX}
 
 %CPP            cpp
-%FPP            cpp -P -CC
+%FPP            cpp -E -P -x c
 %MAKE           gmake
 """.format(
                 **param
diff --git a/spack/packages/yaxt/package.py b/spack/packages/yaxt/package.py
index 2e6f1f8..a63200b 100644
--- a/spack/packages/yaxt/package.py
+++ b/spack/packages/yaxt/package.py
@@ -17,6 +17,8 @@ class Yaxt(AutotoolsPackage):
     depends_on('mpi')
     variant('idxtype', default='int', values=('int','long'), multi=False)
 
+    parallel = False
+
     def setup_build_environment(self, env):
         env.set('CC', self.spec['mpi'].mpicc)
         env.set('CXX', self.spec['mpi'].mpicxx)
@@ -30,6 +32,10 @@ def setup_build_environment(self, env):
             env.prepend_path('PATH', self.spec['intel-oneapi-mpi'].package.component_prefix.bin)
             env.unset('I_MPI_ROOT')
 
+        if '%aocc' in self.spec:
+            # Pretend to be gfortran
+            env.set('FCFLAGS', '-g -DpgiFortran')
+
     def configure_args(self):
         options = []
         options.append('--with-idxtype='+self.spec.variants['idxtype'].value)
diff --git a/tests/envs/lfric.sh b/tests/envs/lfric.sh
index 1f85417..7bfc203 100644
--- a/tests/envs/lfric.sh
+++ b/tests/envs/lfric.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x
 set -eu
 set -o pipefail
 
@@ -45,7 +46,8 @@ envrun lfric_apps/build/local_build.py --application "$APP" --core_source "$BASE
 
 # Run example
 pushd "$BASEDIR/lfric_apps/applications/$APP/example"
-envrun mpirun -n 6 "../bin/$APP" configuration.nml
+# envrun mpirun -n 6 "../bin/$APP" configuration.nml
+srun -n 6 envrun "../bin/$APP" configuration.nml
 
 cat PET0.*.Log
 
diff --git a/tests/run.sh b/tests/run.sh
index c7f33cd..577fcc2 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -14,26 +14,36 @@ source "$SCRIPT_DIR/../utils/common.sh"
 
 ENVIRONMENT="$1"
 export ENVIRONMENT
-SITE="${2:-${NGMOENVS_SITE:-generic}}"
 
-: "${NGMOENVS_BASEDIR:="/scratch/$PROJECT/$USER/ngmo-envs"}"
-export NGMOENVS_BASEDIR
+# Try to detect the site
+if [[ $(hostname -f) =~ gadi.nci.org.au$ ]]; then
+    NGMOENVS_SITE=pawsey
+elif [[ $(hostname -f) =~ setonix.pawsey.org.au$ ]]; then
+    NGMOENVS_SITE=pawsey
+fi
+
+SITE="${2:-${NGMOENVS_SITE:-generic}}"
 
 if [[ ! -d "$SCRIPT_DIR/../environments/$ENVIRONMENT" ]]; then
 	error "Unknown environment $ENVIRONMENT"
 	exit 1
 fi
 
+if [[ ! -f "$SCRIPT_DIR/envs/$ENVIRONMENT.sh" ]]; then
+        error "No test for environment $ENVIRONMENT"
+        exit 1
+fi
+
 echo "Testing $ENVIRONMENT at site $SITE"
 
 if [[ -f "$SCRIPT_DIR/site/$SITE.sh" ]]; then
 	# Run the site-specific test
 	"$SCRIPT_DIR/site/$SITE.sh" "$ENVIRONMENT"
+
 else
-	if [[ ! -f "$SCRIPT_DIR/envs/$ENVIRONMENT.sh" ]]; then
-		error "No test for environment $ENVIRONMENT"
-		exit 1
-	fi
+        # Generic scripts without site specifics
+        : "${NGMOENVS_BASEDIR:="~/ngmo-envs"}"
+        export NGMOENVS_BASEDIR
 
 	# Default path
 	export PATH="$NGMOENVS_BASEDIR/envs/$ENVIRONMENT/bin:$PATH"
diff --git a/tests/site/pawsey.sh b/tests/site/pawsey.sh
new file mode 100755
index 0000000..74b6802
--- /dev/null
+++ b/tests/site/pawsey.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Run an environment test case at Pawsey
+#
+#     tests/run.sh $ENVIRONMENT setonix
+
+set -eu
+set -o pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "$(readlink -f "${BASH_SOURCE[0]}")" )" &> /dev/null && pwd )
+
+ENVIRONMENT="$1"
+
+# Grab $VERSION
+source "$SCRIPT_DIR/../../utils/common.sh"
+
+# Load the environment
+module purge
+module load pawsey pawseyenv
+module use "/scratch/$PAWSEY_PROJECT/$USER/ngmo-envs/modules"
+module load "$ENVIRONMENT/$VERSION"
+module list
+
+# Set up run directory
+export BASEDIR="/scratch/$PAWSEY_PROJECT/$USER/tmp/ngmo-envs-test/$ENVIRONMENT"
+mkdir -p "$BASEDIR"
+
+# Run the test
+/bin/bash "$SCRIPT_DIR/../envs/${ENVIRONMENT}.sh"
diff --git a/utils/bootstrap.sh b/utils/bootstrap.sh
index f32bd9c..72fe1f0 100755
--- a/utils/bootstrap.sh
+++ b/utils/bootstrap.sh
@@ -15,7 +15,6 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "$(readlink -f "${BASH_SOURCE[0]}")" )" &> /d
 source "$SCRIPT_DIR/common.sh"
 
 SPACK_VERSION=0.22.2
-export SPACK_DISABLE_LOCAL_CONFIG=1
 
 mkdir -p "$NGMOENVS_BASEDIR/bin"
 pushd "$NGMOENVS_BASEDIR" > /dev/null
@@ -44,6 +43,11 @@ e spack compiler find --scope site /usr/bin
 e spack external find --scope site --path /usr/bin gcc
 e spack config add --file "$SCRIPT_DIR/spack-packages.yaml"
 
+if [[ -v SPACK_BOOTSTRAP_ROOT ]]; then
+    e spack bootstrap root --scope site "$SPACK_BOOTSTRAP_ROOT"
+fi
+e spack bootstrap now
+
 echo "Default Compiler and MPI:"
 e spack spec --format '{name}@{version}%{compiler.name}@{compiler.version}' mpi
 
diff --git a/utils/common.sh b/utils/common.sh
index 4cae14d..5240d42 100644
--- a/utils/common.sh
+++ b/utils/common.sh
@@ -24,3 +24,5 @@ error() {
 : "${VERSION="$(git symbolic-ref --short HEAD)"}"
 export VERSION
 
+# Don't consider ~/.spack
+export SPACK_DISABLE_LOCAL_CONFIG=1
diff --git a/utils/install-compiler.sh b/utils/install-compiler.sh
index 59a79a5..9786e88 100755
--- a/utils/install-compiler.sh
+++ b/utils/install-compiler.sh
@@ -42,9 +42,9 @@ fi
 
 mkdir -p "$ENVDIR/etc"
 cat > "$ENVDIR/etc/compiler.sh" <<EOF
-export CC="$(sed -n -e 's/^\s*cc\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info")"
-export FC="$(sed -n -e 's/^\s*fc\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info")"
-export CXX="$(sed -n -e 's/^\s*cxx\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info")"
+export CC="$(sed -n -e 's/^\s*cc\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info" | tail -n1)"
+export FC="$(sed -n -e 's/^\s*fc\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info" | tail -n1)"
+export CXX="$(sed -n -e 's/^\s*cxx\s*=\s*\(\S\+\)/\1/p' "$NGMOENVS_TMPDIR/compiler_info" | tail -n1)"
 
 # Compilers for MPI
 export OMPI_CC=\$CC
diff --git a/utils/install-stage-one.sh b/utils/install-stage-one.sh
index 83a33c6..01237a7 100755
--- a/utils/install-stage-one.sh
+++ b/utils/install-stage-one.sh
@@ -113,7 +113,7 @@ if [[ -f "$ENVDEFS/spack.yaml" ]]; then
         e spack config blame
 
 	# Solve dependencies
-	e spack concretize --fresh
+	e spack --debug concretize --fresh
 
 	# Install everything
         if [[ ! -v NGMOENVS_DOWNLOAD_ONLY ]]; then
@@ -141,7 +141,12 @@ export NGMOENVS_ENVIRONMENT="$ENVIRONMENT"
 export NGMOENVS_ENVDIR="$ENVDIR"
 export NGMOENVS_COMPILER="$NGMOENVS_COMPILER"
 export NGMOENVS_MPI="$NGMOENVS_MPI"
+EOF
+
+# Set compiler variables
+cat "$ENVDIR/etc/compiler.sh" >> "$ENVDIR/bin/activate"
 
+cat >> "$ENVDIR/bin/activate" <<EOF
 # If we have bootstrapped, activate the bootstrap
 if [[ -f "$NGMOENVS_BASEDIR/bin/activate" ]]; then
     source "$NGMOENVS_BASEDIR/bin/activate"
@@ -150,6 +155,7 @@ fi
 # If this env has a spack environment, activate it
 if [[ -d "\$NGMOENVS_ENVDIR/spack" ]]; then
     spack env activate "\$NGMOENVS_ENVDIR/spack"
+    export LD_LIBRARY_PATH="\$SPACK_ENV/.spack-env/view/lib:\$LD_LIBRARY_PATH"
     export CPATH="\$SPACK_ENV/.spack-env/view/include:\$CPATH"
 fi
 
@@ -162,9 +168,7 @@ if [[ -f "\$NGMOENVS_ENVDIR/etc/env.activate.sh" ]]; then
 	source "\$NGMOENVS_ENVDIR/etc/env.activate.sh"
 fi
 EOF
-
-# Set compiler variables
-cat "$ENVDIR/etc/compiler.sh" >> "$ENVDIR/bin/activate"
+e cat "$ENVDIR/bin/activate"
 
 # Run script
 cat > "$ENVDIR/bin/envrun" <<EOF
diff --git a/utils/spack-packages.yaml b/utils/spack-packages.yaml
index bfd93eb..f8fee84 100644
--- a/utils/spack-packages.yaml
+++ b/utils/spack-packages.yaml
@@ -35,10 +35,11 @@ packages:
           # If the default compiler is oneapi use intel for xios
           # Blitz compiler must match xios
           - one_of:
-              - "%intel ^netcdf-c%oneapi ^blitz%intel"
-              - "%intel ^netcdf-c%intel  ^blitz%intel"
-              - "%gcc   ^netcdf-c%gcc    ^blitz%gcc"
-              - "%nvhpc ^netcdf-c%nvhpc  ^blitz%nvhpc"
+              - "%intel ^glibc%oneapi ^blitz%intel"
+              - "%intel ^glibc%intel  ^blitz%intel"
+              - "%gcc   ^glibc%gcc    ^blitz%gcc"
+              - "%nvhpc ^glibc%nvhpc  ^blitz%nvhpc"
+              - "%cce   ^glibc%cce    ^blitz%cce"
   blitz:
       # Remove the compiler constraint so it can satisfy XIOS
       require:
@@ -47,3 +48,4 @@ packages:
               - "%oneapi"
               - "%gcc"
               - "%nvhpc"
+              - "%cce"