diff --git a/docs/developers_guide/adding_new_machine.md b/docs/developers_guide/adding_new_machine.md
index ff588950..dfb9a153 100644
--- a/docs/developers_guide/adding_new_machine.md
+++ b/docs/developers_guide/adding_new_machine.md
@@ -35,7 +35,7 @@ machines from hostnames with the following regular expressions:
 ```python
 '^chr-\d{4}'  # Chrysalis compute nodes with hostnames chr-0000 to chr-9999
 '^compy'      # Compy nodes with hostname compy
-'^n\d{4}'     # Anvil nodes with hostnames n0000 to n9999
+'^dane\d{1,4}' # Dane nodes with hostnames dane0 to dane9999
 ```
 
 In some cases, the hostname assigned to a machine is too generic to 
@@ -58,4 +58,3 @@ Identifying the machine by environment variables is **not recommended** unless
 absolutely necessary.
 :::
 
-
diff --git a/docs/users_guide/quick_start.md b/docs/users_guide/quick_start.md
index abe5a39b..c899e11d 100644
--- a/docs/users_guide/quick_start.md
+++ b/docs/users_guide/quick_start.md
@@ -31,7 +31,7 @@ function can also be used to detect which machine you are on.
 As an example, the result of `print(machine_info)` is:
 
 ```
-Machine: anvil
+Machine: chrysalis
   E3SM Supported Machine: True
   Compilers: intel, gnu
   MPI libraries: impi, openmpi, mvapich
@@ -72,9 +72,8 @@ you don't need to provide the machine name. It can be discovered automatically:
 
 - andes
 - aurora
-- anvil
-- chicoma-cpu
 - chrysalis
+- chicoma-cpu
 - compy
 - dane
 - frontier
diff --git a/docs/users_guide/sync/diags.md b/docs/users_guide/sync/diags.md
index 9b186d4e..6f50b5a2 100644
--- a/docs/users_guide/sync/diags.md
+++ b/docs/users_guide/sync/diags.md
@@ -14,7 +14,7 @@ The command supports two directions:
 
 Important constraints:
 
-- LCRC machines are `anvil` and `chrysalis`
+- LCRC machine is `chrysalis`
 - You may only:
   - run `to` when you are currently on an LCRC machine; and
   - run `from` when the other machine is an LCRC machine.
@@ -157,7 +157,7 @@ mache sync diags from <other> [-u <username>] [-m <this_machine>] [-f <config_fi
 
 Constraints enforced by the command:
 
-- Only `anvil`/`chrysalis` are considered LCRC machines
+- Only `chrysalis` is considered an LCRC machine
 - `to` is only allowed when you are on an LCRC machine
 - `from` is only allowed when the other machine is an LCRC machine
 - Do not attempt to sync between two different LCRC machines (there is no need
diff --git a/mache/machines/anvil.cfg b/mache/machines/anvil.cfg
deleted file mode 100644
index b8d1932e..00000000
--- a/mache/machines/anvil.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-# Options related to deploying an e3sm-unified conda environment on supported
-# machines
-[e3sm_unified]
-
-# the unix group for permissions for the e3sm-unified conda environment
-group = cels
-
-# the compiler set to use for system libraries
-compiler = gnu
-
-# the system MPI library
-mpi = openmpi
-
-# the path to the directory where activation scripts, the base environment, and
-# system libraries will be deployed
-base_path = /lcrc/soft/climate/e3sm-unified
-
-# whether to use E3SM modules for hdf5, netcdf-c, netcdf-fortran and pnetcdf
-# (spack modules are used otherwise)
-use_e3sm_hdf5_netcdf = False
-
-
-# config options related to data needed by diagnostics software such as
-# e3sm_diags and MPAS-Analysis
-[diagnostics]
-
-# The base path to the diagnostics directory
-base_path = /lcrc/group/e3sm/diagnostics
-
-# the unix group for permissions for diagnostics
-group = cels
-
-
-# config options associated with web portals
-[web_portal]
-
-# The path to the base of the web portals
-base_path = /lcrc/group/e3sm/public_html/diagnostic_output
-
-# The base URL that corresponds to the base path
-base_url = https://web.lcrc.anl.gov/public/e3sm/diagnostic_output
-
-
-# The parallel section describes options related to running jobs in parallel
-[parallel]
-
-# parallel system of execution: slurm, pbs or single_node
-system = slurm
-
-# whether to use mpirun or srun to run a task
-parallel_executable = srun
-
-# cores per node on the machine
-cores_per_node = 36
-
-# account for running diagnostics jobs
-account = condo
-
-# available partition(s) (default is the first)
-partitions = acme-small, acme-medium, acme-large
-
-# quality of service (default is the first)
-qos = regular, acme_high
-
-
-# config options related to synchronizing files
-[sync]
-
-# the full hostname of the machine
-hostname = blues.lcrc.anl.gov
-
-# public diagnostics directory
-public_diags = /lcrc/group/e3sm/public_html/diagnostics
-
-# private diagnostics directory
-private_diags = /lcrc/group/e3sm/diagnostics_private
-
-
-# Options related to machine discovery
-[discovery]
-
-# regular expression(s) used to identify this machine from its hostname
-hostname_re = ^blueslogin, ^b\d{3}, ^n\d{4}
diff --git a/mache/spack/templates/anvil_gnu_mvapich.yaml b/mache/spack/templates/anvil_gnu_mvapich.yaml
deleted file mode 100644
index 5204cf16..00000000
--- a/mache/spack/templates/anvil_gnu_mvapich.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
-{%- set compiler = "gcc@8.2.0" %}
-{%- set mpi = "mvapich2@2.2" %}
-
-spack:
-  specs:
-  - {{ compiler }}
-  - {{ mpi }}%{{ compiler }}
-{%- if e3sm_lapack %}
-  - intel-mkl
-{%- endif %}
-{%- if e3sm_hdf5_netcdf %}
-  - "hdf5%{{ compiler }}"
-  - "netcdf-c%{{ compiler }}"
-  - "netcdf-fortran%{{ compiler }}"
-  - "parallel-netcdf%{{ compiler }}"
-{%- endif %}
-{%- for spec in specs %}
-  - "{{ spec }}%{{ compiler }}"
-{%- endfor %}
-  concretizer:
-    unify: true
-  packages:
-    all:
-      compiler: [{{ compiler }}]
-      providers:
-        mpi: [{{ mpi }}%{{ compiler }}]
-{%- if e3sm_lapack %}
-        lapack: [intel-mkl@2020.4.304]
-{%- endif %}
-    bison:
-      externals:
-      - spec: bison@3.0.4
-        prefix: /usr
-      buildable: false
-    bzip2:
-      externals:
-      - spec: bzip2@1.0.6
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/bzip2-1.0.6-mbwr6sk
-      buildable: false
-    cmake:
-      externals:
-      - spec: cmake@3.26.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-11.3.0/cmake-3.26.3-nszudya
-      buildable: false
-    curl:
-      externals:
-      - spec: curl@7.72.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/curl-7.72.0-bnppi6e
-      buildable: false
-    diffutils:
-      externals:
-      - spec: diffutils@3.7
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/diffutils-3.7-lmwmgqg
-      buildable: false
-    findutils:
-      externals:
-      - spec: findutils@4.6.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/findutils-4.6.0-ef3lzvf
-      buildable: false
-    gettext:
-      externals:
-      - spec: gettext@0.19.8.1
-        prefix: /usr
-      buildable: false
-    libiconv:
-      externals:
-      - spec: libiconv@1.16
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libiconv-1.16-gcutq6m
-      buildable: false
-    libxml2:
-      externals:
-      - spec: libxml2@2.9.10
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libxml2-2.9.10-dwvqy3m
-      buildable: false
-    m4:
-      externals:
-      - spec: m4@1.4.16
-        prefix: /usr
-      buildable: false
-    openssl:
-      externals:
-      - spec: openssl@1.0.2k
-        prefix: /usr
-      buildable: false
-    tar:
-      externals:
-      - spec: tar@1.26
-        prefix: /usr
-      buildable: false
-    xz:
-      externals:
-      - spec: xz@5.2.5
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/xz-5.2.5-6uopvxd
-      buildable: false
-    zlib:
-      externals:
-      - spec: zlib@1.2.11
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
-      buildable: false
-    perl:
-      externals:
-      - spec: perl@5.30.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/perl-5.30.3-co3kopi
-        modules:
-          - perl/5.30.3-co3kopi
-      buildable: false
-    gcc:
-      externals:
-      - spec: {{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33
-        modules:
-        - gcc/8.2.0-xhxgy33
-        extra_attributes:
-          compilers:
-            c: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
-            cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
-            fortran: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-      buildable: false
-    mvapich2:
-      externals:
-      - spec: m{{ mpi }}%{{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/mvapich2-2.2-ppznoge
-        modules:
-        - mvapich2/2.2-verbs-ppznoge
-      buildable: false
-    intel-mkl:
-      externals:
-      - spec: intel-mkl@2020.4.304
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/intel-mkl-2020.4.304-d6zw4xa
-        modules:
-        - intel-mkl/2020.4.304-d6zw4xa
-      buildable: false
-{%- if e3sm_hdf5_netcdf %}
-    hdf5:
-      externals:
-      - spec: hdf5@1.10.7+cxx+fortran+hl+mpi
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/hdf5-1.10.7-wburbwj
-        modules:
-        - hdf5/1.10.7-wburbwj
-      buildable: false
-    netcdf-c:
-      externals:
-      - spec: netcdf-c@4.4.1+mpi~parallel-netcdf
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/netcdf-4.4.1-ve2zfkw
-        modules:
-        - netcdf/4.4.1-ve2zfkw
-      buildable: false
-    netcdf-fortran:
-      externals:
-      - spec: netcdf-fortran@4.4.4
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/netcdf-fortran-4.4.4-thtylny
-        modules:
-        - netcdf-fortran/4.4.4-thtylny
-      buildable: false
-    parallel-netcdf:
-      externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/parallel-netcdf-1.11.0-c22b2bn
-        modules:
-        - parallel-netcdf/1.11.0-c22b2bn
-      buildable: false
-{%- endif %}
-  compilers:
-  - compiler:
-      spec: {{ compiler }}
-      paths:
-        cc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
-        cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
-        f77: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-        fc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules: []
-      environment:
-        prepend_path:
-          MODULEPATH: /lcrc/group/e3sm/soft/modulefiles/anvil
-      extra_rpaths: []
diff --git a/mache/spack/templates/anvil_gnu_openmpi.yaml b/mache/spack/templates/anvil_gnu_openmpi.yaml
deleted file mode 100644
index 4d447a70..00000000
--- a/mache/spack/templates/anvil_gnu_openmpi.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-{%- set compiler = "gcc@8.2.0" %}
-{%- set mpi = "openmpi@4.1.1" %}
-spack:
-  specs:
-  - {{ compiler }}
-  - {{ mpi }}%{{ compiler }}
-{%- if e3sm_lapack %}
-  - intel-mkl
-{%- endif %}
-{%- if e3sm_hdf5_netcdf %}
-  - "hdf5%{{ compiler }}"
-  - "netcdf-c%{{ compiler }}"
-  - "netcdf-fortran%{{ compiler }}"
-  - "parallel-netcdf%{{ compiler }}"
-{%- endif %}
-{%- for spec in specs %}
-  - "{{ spec }}%{{ compiler }}"
-{%- endfor %}
-  concretizer:
-    unify: true
-  packages:
-    all:
-      compiler: [{{ compiler }}]
-      providers:
-        mpi: [{{ mpi }}%{{ compiler }}]
-{%- if e3sm_lapack %}
-        lapack: [intel-mkl@2020.4.304]
-{%- endif %}
-    bison:
-      externals:
-      - spec: bison@3.0.4
-        prefix: /usr
-      buildable: false
-    bzip2:
-      externals:
-      - spec: bzip2@1.0.6
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/bzip2-1.0.6-mbwr6sk
-      buildable: false
-    cmake:
-      externals:
-      - spec: cmake@3.26.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-11.3.0/cmake-3.26.3-nszudya
-      buildable: false
-    curl:
-      externals:
-      - spec: curl@7.72.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/curl-7.72.0-bnppi6e
-      buildable: false
-    diffutils:
-      externals:
-      - spec: diffutils@3.7
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/diffutils-3.7-lmwmgqg
-      buildable: false
-    findutils:
-      externals:
-      - spec: findutils@4.6.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/findutils-4.6.0-ef3lzvf
-      buildable: false
-    gettext:
-      externals:
-      - spec: gettext@0.19.8.1
-        prefix: /usr
-      buildable: false
-    libiconv:
-      externals:
-      - spec: libiconv@1.16
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libiconv-1.16-gcutq6m
-      buildable: false
-    libxml2:
-      externals:
-      - spec: libxml2@2.9.10
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libxml2-2.9.10-dwvqy3m
-      buildable: false
-    m4:
-      externals:
-      - spec: m4@1.4.16
-        prefix: /usr
-      buildable: false
-    openssl:
-      externals:
-      - spec: openssl@1.0.2k
-        prefix: /usr
-      buildable: false
-    tar:
-      externals:
-      - spec: tar@1.26
-        prefix: /usr
-      buildable: false
-    xz:
-      externals:
-      - spec: xz@5.2.5
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/xz-5.2.5-6uopvxd
-      buildable: false
-    zlib:
-      externals:
-      - spec: zlib@1.2.11
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
-      buildable: false
-    perl:
-      externals:
-      - spec: perl@5.30.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/perl-5.30.3-co3kopi
-        modules:
-          - perl/5.30.3-co3kopi
-      buildable: false
-    gcc:
-      externals:
-      - spec: {{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33
-        modules:
-        - gcc/8.2.0-xhxgy33
-        extra_attributes:
-          compilers:
-            c: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
-            cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
-            fortran: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-      buildable: false
-    openmpi:
-      externals:
-      - spec: {{ mpi }}%{{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/openmpi-4.1.1-x5n4m36
-        modules:
-        - openmpi/4.1.1-x5n4m36
-      buildable: false
-    intel-mkl:
-      externals:
-      - spec: intel-mkl@2020.4.304
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/intel-mkl-2020.4.304-d6zw4xa
-        modules:
-        - intel-mkl/2020.4.304-d6zw4xa
-      buildable: false
-{%- if e3sm_hdf5_netcdf %}
-    hdf5:
-      externals:
-      - spec: hdf5@1.10.7+cxx+fortran+hl+mpi
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/hdf5-1.10.7-w35u23y
-        modules:
-        - hdf5/1.10.7-w35u23y
-      buildable: false
-    netcdf-c:
-      externals:
-      - spec: netcdf-c@4.4.1+mpi~parallel-netcdf
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/netcdf-c-4.4.1-mtfptpl
-        modules:
-        - netcdf-c/4.4.1-mtfptpl
-      buildable: false
-    netcdf-fortran:
-      externals:
-      - spec: netcdf-fortran@4.4.4
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/netcdf-fortran-4.4.4-5yd6dos
-        modules:
-        - netcdf-fortran/4.4.4-5yd6dos
-      buildable: false
-    parallel-netcdf:
-      externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-8.2.0/parallel-netcdf-1.11.0-a7ohxsg
-        modules:
-        - parallel-netcdf/1.11.0-a7ohxsg
-      buildable: false
-{%- endif %}
-  compilers:
-  - compiler:
-      spec: {{ compiler }}
-      paths:
-        cc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
-        cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
-        f77: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-        fc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules: []
-      environment:
-        prepend_path:
-          MODULEPATH: /lcrc/group/e3sm/soft/modulefiles/anvil
-      extra_rpaths: []
diff --git a/mache/spack/templates/anvil_intel_impi.yaml b/mache/spack/templates/anvil_intel_impi.yaml
deleted file mode 100644
index e0f7bb1b..00000000
--- a/mache/spack/templates/anvil_intel_impi.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-{%- set compiler = "intel@20.0.4" %}
-{%- set mpi = "intel-mpi@2019.9.304" %}
-spack:
-  specs:
-  - {{ compiler }}
-  - {{ mpi }}%{{ compiler }}
-{%- if e3sm_lapack %}
-  - intel-mkl
-{%- endif %}
-{%- if e3sm_hdf5_netcdf %}
-  - "hdf5%{{ compiler }}"
-  - "netcdf-c%{{ compiler }}"
-  - "netcdf-fortran%{{ compiler }}"
-  - "parallel-netcdf%{{ compiler }}"
-{%- endif %}
-{%- for spec in specs %}
-  - "{{ spec }}%{{ compiler }}"
-{%- endfor %}
-  concretizer:
-    unify: true
-  packages:
-    all:
-      compiler: [{{ compiler }}]
-      providers:
-        mpi: [{{ mpi }}%{{ compiler }}]
-{%- if e3sm_lapack %}
-        lapack: [intel-mkl@2020.4.304]
-{%- endif %}
-    bison:
-      externals:
-      - spec: bison@3.0.4
-        prefix: /usr
-      buildable: false
-    bzip2:
-      externals:
-      - spec: bzip2@1.0.6
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/bzip2-1.0.6-mbwr6sk
-      buildable: false
-    cmake:
-      externals:
-      - spec: cmake@3.26.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-11.3.0/cmake-3.26.3-nszudya
-      buildable: false
-    curl:
-      externals:
-      - spec: curl@7.72.0~gssapi~libssh~libssh2~nghttp2
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/curl-7.72.0-bnppi6e
-      buildable: false
-    diffutils:
-      externals:
-      - spec: diffutils@3.7
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/diffutils-3.7-lmwmgqg
-      buildable: false
-    findutils:
-      externals:
-      - spec: findutils@4.6.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/findutils-4.6.0-ef3lzvf
-      buildable: false
-    gettext:
-      externals:
-      - spec: gettext@0.19.8.1
-        prefix: /usr
-      buildable: false
-    libiconv:
-      externals:
-      - spec: libiconv@1.16
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libiconv-1.16-gcutq6m
-      buildable: false
-    libxml2:
-      externals:
-      - spec: libxml2@2.9.10
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libxml2-2.9.10-dwvqy3m
-      buildable: false
-    m4:
-      externals:
-      - spec: m4@1.4.16
-        prefix: /usr
-      buildable: false
-    openssl:
-      externals:
-      - spec: openssl@1.0.2k
-        prefix: /usr
-      buildable: false
-    tar:
-      externals:
-      - spec: tar@1.26
-        prefix: /usr
-      buildable: false
-    xz:
-      externals:
-      - spec: xz@5.2.5
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/xz-5.2.5-6uopvxd
-      buildable: false
-    zlib:
-      externals:
-      - spec: zlib@1.2.11
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
-      buildable: false
-    perl:
-      externals:
-      - spec: perl@5.30.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/perl-5.30.3-co3kopi
-        modules:
-          - perl/5.30.3-co3kopi
-      buildable: false
-    intel:
-      externals:
-      - spec: {{ compiler }}
-        modules:
-        - gcc/8.2.0
-        - intel/20.0.4-lednsve
-      buildable: false
-    intel-mpi:
-      externals:
-      - spec: {{ mpi }}%{{ compiler }}
-        modules:
-        - intel-mpi/2019.9.304-i42whlw
-      buildable: false
-    intel-mkl:
-      externals:
-      - spec: intel-mkl@2020.4.304
-        modules:
-        - intel-mkl/2020.4.304-voqlapk
-      buildable: false
-{%- if e3sm_hdf5_netcdf %}
-    hdf5:
-      externals:
-      - spec: hdf5@1.10.7+cxx+fortran+hl+mpi
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/hdf5-1.10.7-ugvomvt
-        modules:
-        - hdf5/1.10.7-ugvomvt
-      buildable: false
-    netcdf-c:
-      externals:
-      - spec: netcdf-c@4.4.1+mpi~parallel-netcdf
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-c-4.4.1-blyisdg
-        modules:
-        - netcdf-c/4.4.1-blyisdg
-      buildable: false
-    netcdf-fortran:
-      externals:
-      - spec: netcdf-fortran@4.4.4
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-eanrh5t
-        modules:
-        - netcdf-fortran/4.4.4-eanrh5t
-      buildable: false
-    parallel-netcdf:
-      externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-y3nmmej
-        modules:
-        - parallel-netcdf/1.11.0-y3nmmej
-      buildable: false
-{%- endif %}
-  compilers:
-  - compiler:
-      spec: {{ compiler }}
-      paths:
-        cc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icc
-        cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icpc
-        f77: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-        fc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules:
-      - gcc/8.2.0
-      - intel/20.0.4-lednsve
-      environment:
-        prepend_path:
-          MODULEPATH: /lcrc/group/e3sm/soft/modulefiles/anvil
-      extra_rpaths: []
diff --git a/mache/spack/templates/anvil_intel_mvapich.yaml b/mache/spack/templates/anvil_intel_mvapich.yaml
deleted file mode 100644
index f42e4a84..00000000
--- a/mache/spack/templates/anvil_intel_mvapich.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
-{%- set compiler = "intel@20.0.4" %}
-{%- set mpi = "mvapich2@4.1.1" %}
-spack:
-  specs:
-  - {{ compiler }}
-  - {{ mpi }}%{{ compiler }}
-{%- if e3sm_lapack %}
-  - intel-mkl
-{%- endif %}
-{%- if e3sm_hdf5_netcdf %}
-  - "hdf5%{{ compiler }}"
-  - "netcdf-c%{{ compiler }}"
-  - "netcdf-fortran%{{ compiler }}"
-  - "parallel-netcdf%{{ compiler }}"
-{%- endif %}
-{%- for spec in specs %}
-  - "{{ spec }}%{{ compiler }}"
-{%- endfor %}
-  concretizer:
-    unify: true
-  packages:
-    all:
-      compiler: [{{ compiler }}]
-      providers:
-        mpi: [{{ mpi }}%{{ compiler }}]
-{%- if e3sm_lapack %}
-        lapack: [intel-mkl@2020.4.304]
-{%- endif %}
-    bison:
-      externals:
-      - spec: bison@3.0.4
-        prefix: /usr
-      buildable: false
-    bzip2:
-      externals:
-      - spec: bzip2@1.0.6
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/bzip2-1.0.6-mbwr6sk
-      buildable: false
-    cmake:
-      externals:
-      - spec: cmake@3.26.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-11.3.0/cmake-3.26.3-nszudya
-      buildable: false
-    curl:
-      externals:
-      - spec: curl@7.72.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/curl-7.72.0-bnppi6e
-      buildable: false
-    diffutils:
-      externals:
-      - spec: diffutils@3.7
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/diffutils-3.7-lmwmgqg
-      buildable: false
-    findutils:
-      externals:
-      - spec: findutils@4.6.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/findutils-4.6.0-ef3lzvf
-      buildable: false
-    gettext:
-      externals:
-      - spec: gettext@0.19.8.1
-        prefix: /usr
-      buildable: false
-    libiconv:
-      externals:
-      - spec: libiconv@1.16
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libiconv-1.16-gcutq6m
-      buildable: false
-    libxml2:
-      externals:
-      - spec: libxml2@2.9.10
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libxml2-2.9.10-dwvqy3m
-      buildable: false
-    m4:
-      externals:
-      - spec: m4@1.4.16
-        prefix: /usr
-      buildable: false
-    openssl:
-      externals:
-      - spec: openssl@1.0.2k
-        prefix: /usr
-      buildable: false
-    tar:
-      externals:
-      - spec: tar@1.26
-        prefix: /usr
-      buildable: false
-    xz:
-      externals:
-      - spec: xz@5.2.5
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/xz-5.2.5-6uopvxd
-      buildable: false
-    zlib:
-      externals:
-      - spec: zlib@1.2.11
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
-      buildable: false
-    perl:
-      externals:
-      - spec: perl@5.30.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/perl-5.30.3-co3kopi
-        modules:
-          - perl/5.30.3-co3kopi
-      buildable: false
-    intel:
-      externals:
-      - spec: {{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve
-        modules:
-        - gcc/8.2.0
-        - intel/20.0.4-lednsve
-      buildable: false
-    mvapich2:
-      externals:
-      - spec: {{ mpi }}%{{ compiler }}
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/mvapich2-2.3.6-x4iz7lq
-        modules:
-        - mvapich2/2.3.6-verbs-x4iz7lq
-      buildable: false
-    intel-mkl:
-      externals:
-      - spec: intel-mkl@2020.4.304
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/intel-mkl-2020.4.304-voqlapk
-        modules:
-        - intel-mkl/2020.4.304-voqlapk
-      buildable: false
-{%- if e3sm_hdf5_netcdf %}
-    hdf5:
-      externals:
-      - spec: hdf5@1.10.7+cxx+fortran+hl+mpi
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/hdf5-1.10.7-igh6foh
-        modules:
-        - hdf5/1.10.7-igh6foh
-      buildable: false
-    netcdf-c:
-      externals:
-      - spec: netcdf-c@4.4.1+mpi~parallel-netcdf
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-c-4.4.1-gei7x7w
-        modules:
-        - netcdf-c/4.4.1-gei7x7w
-      buildable: false
-    netcdf-fortran:
-      externals:
-      - spec: netcdf-fortran@4.4.4
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-b4ldb3a
-        modules:
-        - netcdf-fortran/4.4.4-b4ldb3a
-      buildable: false
-    parallel-netcdf:
-      externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-kj4jsvt
-        modules:
-        - parallel-netcdf/1.11.0-kj4jsvt
-      buildable: false
-{%- endif %}
-  compilers:
-  - compiler:
-      spec: {{ compiler }}
-      paths:
-        cc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icc
-        cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icpc
-        f77: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-        fc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules: []
-      environment:
-        prepend_path:
-          MODULEPATH: /lcrc/group/e3sm/soft/modulefiles/anvil
-      extra_rpaths: []
diff --git a/mache/spack/templates/anvil_intel_openmpi.yaml b/mache/spack/templates/anvil_intel_openmpi.yaml
deleted file mode 100644
index 80175c8b..00000000
--- a/mache/spack/templates/anvil_intel_openmpi.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-{%- set compiler = "intel@20.0.4" %}
-{%- set mpi = "openmpi@4.1.1" %}
-spack:
-  specs:
-  - {{ compiler }}
-  - {{ mpi }}%{{ compiler }}
-{%- if e3sm_lapack %}
-  - intel-mkl
-{%- endif %}
-{%- if e3sm_hdf5_netcdf %}
-  - "hdf5%{{ compiler }}"
-  - "netcdf-c%{{ compiler }}"
-  - "netcdf-fortran%{{ compiler }}"
-  - "parallel-netcdf%{{ compiler }}"
-{%- endif %}
-{%- for spec in specs %}
-  - "{{ spec }}%{{ compiler }}"
-{%- endfor %}
-  concretizer:
-    unify: true
-  packages:
-    all:
-      compiler: [{{ compiler }}]
-      providers:
-        mpi: [{{ mpi }}%{{ compiler }}]
-{%- if e3sm_lapack %}
-        lapack: [intel-mkl@2020.4.304]
-{%- endif %}
-    bison:
-      externals:
-      - spec: bison@3.0.4
-        prefix: /usr
-      buildable: false
-    bzip2:
-      externals:
-      - spec: bzip2@1.0.6
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/bzip2-1.0.6-mbwr6sk
-      buildable: false
-    cmake:
-      externals:
-      - spec: cmake@3.26.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-11.3.0/cmake-3.26.3-nszudya
-      buildable: false
-    curl:
-      externals:
-      - spec: curl@7.72.0~gssapi~libssh~libssh2~nghttp2
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/curl-7.72.0-bnppi6e
-      buildable: false
-    diffutils:
-      externals:
-      - spec: diffutils@3.7
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/diffutils-3.7-lmwmgqg
-      buildable: false
-    findutils:
-      externals:
-      - spec: findutils@4.6.0
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/findutils-4.6.0-ef3lzvf
-      buildable: false
-    gettext:
-      externals:
-      - spec: gettext@0.19.8.1
-        prefix: /usr
-      buildable: false
-    libiconv:
-      externals:
-      - spec: libiconv@1.16
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libiconv-1.16-gcutq6m
-      buildable: false
-    libxml2:
-      externals:
-      - spec: libxml2@2.9.10
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/libxml2-2.9.10-dwvqy3m
-      buildable: false
-    m4:
-      externals:
-      - spec: m4@1.4.16
-        prefix: /usr
-      buildable: false
-    openssl:
-      externals:
-      - spec: openssl@1.0.2k
-        prefix: /usr
-      buildable: false
-    tar:
-      externals:
-      - spec: tar@1.26
-        prefix: /usr
-      buildable: false
-    xz:
-      externals:
-      - spec: xz@5.2.5
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/xz-5.2.5-6uopvxd
-      buildable: false
-    zlib:
-      externals:
-      - spec: zlib@1.2.11
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
-      buildable: false
-    perl:
-      externals:
-      - spec: perl@5.30.3
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/perl-5.30.3-co3kopi
-        modules:
-          - perl/5.30.3-co3kopi
-      buildable: false
-    intel:
-      externals:
-      - spec: {{ compiler }}
-        modules:
-        - gcc/8.2.0
-        - intel/20.0.4-lednsve
-      buildable: false
-    openmpi:
-      externals:
-      - spec: {{ mpi }}%{{ compiler }}
-        modules:
-        - openmpi/4.1.1-v3b3npd
-      buildable: false
-    intel-mkl:
-      externals:
-      - spec: intel-mkl@2020.4.304
-        modules:
-        - intel-mkl/2020.4.304-voqlapk
-      buildable: false
-{%- if e3sm_hdf5_netcdf %}
-    hdf5:
-      externals:
-      - spec: hdf5@1.10.7+cxx+fortran+hl+mpi
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/hdf5-1.10.7-x2bsbeu
-        modules:
-        - hdf5/1.10.7-x2bsbeu
-      buildable: false
-    netcdf-c:
-      externals:
-      - spec: netcdf-c@4.4.1+mpi~parallel-netcdf
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-c-4.4.1-smyuxme
-        modules:
-        - netcdf-c/4.4.1-smyuxme
-      buildable: false
-    netcdf-fortran:
-      externals:
-      - spec: netcdf-fortran@4.4.4
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/netcdf-fortran-4.4.4-mablvyc
-        modules:
-        - netcdf-fortran/4.4.4-mablvyc
-      buildable: false
-    parallel-netcdf:
-      externals:
-      - spec: parallel-netcdf@1.11.0+cxx+fortran
-        prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/intel-20.0.4/parallel-netcdf-1.11.0-x4n5s7k
-        modules:
-        - parallel-netcdf/1.11.0-x4n5s7k
-      buildable: false
-{%- endif %}
-  compilers:
-  - compiler:
-      spec: {{ compiler }}
-      paths:
-        cc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icc
-        cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/icpc
-        f77: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-        fc: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/intel-20.0.4-lednsve/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort
-      flags: {}
-      operating_system: centos7
-      target: x86_64
-      modules:
-      - gcc/8.2.0
-      - intel/20.0.4-lednsve
-      environment:
-        prepend_path:
-          MODULEPATH: /lcrc/group/e3sm/soft/modulefiles/anvil
-      extra_rpaths: []
diff --git a/mache/sync/diags.py b/mache/sync/diags.py
index 1af787c4..4a057f07 100644
--- a/mache/sync/diags.py
+++ b/mache/sync/diags.py
@@ -32,7 +32,7 @@ def sync_diags(  # noqa: C901
     machine_info = MachineInfo(machine=machine)
     machine = machine_info.machine
 
-    lcrc_machines = ['anvil', 'chrysalis']
+    lcrc_machines = ['chrysalis']
     if direction == 'to' and machine not in lcrc_machines:
         raise ValueError(
             f'You can only sync diagnostics to another machine '
diff --git a/tests/test_machine_info.py b/tests/test_machine_info.py
index 89a63756..a8bd34d9 100644
--- a/tests/test_machine_info.py
+++ b/tests/test_machine_info.py
@@ -6,12 +6,12 @@ def test_discover_machine():
 
 
 def test_machine_info():
-    machine = 'anvil'
+    machine = 'chrysalis'
     machinfo = MachineInfo(machine=machine)
     assert machinfo.machine == machine
     assert machinfo.e3sm_supported
     config = machinfo.config
-    assert config.get('sync', 'hostname') == 'blues.lcrc.anl.gov'
+    assert config.get('sync', 'hostname') == 'chrysalis.lcrc.anl.gov'
     print(machinfo)
 
     machine = 'unknown'