diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py
index 51c5787d4bec7bb1c4f9023dee8a52056e475d06..0e24886ba66fb4601d7d9a294e9d3ec2f8ae11b7 100644
--- a/var/spack/repos/builtin/packages/amrvis/package.py
+++ b/var/spack/repos/builtin/packages/amrvis/package.py
@@ -16,7 +16,7 @@ class Amrvis(MakefilePackage):
     homepage = "https://github.com/AMReX-Codes/Amrvis"
     git      = "https://github.com/AMReX-Codes/Amrvis.git"
 
-    version('master', tag='master')
+    version('main', tag='main')
 
     variant(
         'dims',
@@ -69,7 +69,7 @@ class Amrvis(MakefilePackage):
     # Need to clone AMReX into Amrvis because Amrvis uses AMReX's source
     resource(name='amrex',
              git='https://github.com/AMReX-Codes/amrex.git',
-             tag='master',
+             tag='development',
              placement='amrex')
 
     def edit(self, spec, prefix):