diff --git a/MPI/amrex/files/variants b/MPI/amrex/files/variants
deleted file mode 100644
index 6975014..0000000
--- a/MPI/amrex/files/variants
+++ /dev/null
@@ -1,29 +0,0 @@
-amrex/18.07_2d	stable		gcc/7.3.0 openmpi/1.10.7 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/7.3.0 openmpi/2.1.5 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/7.3.0 openmpi/3.0.0 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/7.3.0 openmpi/3.1.2 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/7.3.0 openmpi/3.1.3 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/7.4.0 openmpi/3.1.4 b:cmake/3.10.3
-
-amrex/18.07_2d	stable		gcc/8.2.0 openmpi/1.10.7 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/8.2.0 openmpi/2.1.5 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/8.2.0 openmpi/3.1.3 b:cmake/3.9.6
-
-amrex/18.07_2d	stable		gcc/7.3.0 mpich/3.2.1 b:cmake/3.9.6
-amrex/18.07_2d	stable		gcc/8.2.0 mpich/3.2.1 b:cmake/3.9.6
-
-
-amrex/18.07_3d	stable		gcc/7.3.0 openmpi/1.10.7 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/7.3.0 openmpi/2.1.5 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/7.3.0 openmpi/3.0.0 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/7.3.0 openmpi/3.1.2 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/7.3.0 openmpi/3.1.3 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/7.4.0 openmpi/3.1.4 b:cmake/3.10.3
-
-amrex/18.07_3d	stable		gcc/8.2.0 openmpi/1.10.7 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/8.2.0 openmpi/2.1.5 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/8.2.0 openmpi/3.1.3 b:cmake/3.9.6
-
-amrex/18.07_3d	stable		gcc/7.3.0 mpich/3.2.1 b:cmake/3.9.6
-amrex/18.07_3d	stable		gcc/8.2.0 mpich/3.2.1 b:cmake/3.9.6
-
diff --git a/MPI/amrex/files/variants.merlin6 b/MPI/amrex/files/variants.merlin6
new file mode 100644
index 0000000..ddd3bae
--- /dev/null
+++ b/MPI/amrex/files/variants.merlin6
@@ -0,0 +1,2 @@
+amrex/18.07_3d_slurm	unstable	gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm b:cmake/3.15.5
+
diff --git a/MPI/amrex/files/variants.rhel6 b/MPI/amrex/files/variants.rhel6
new file mode 100644
index 0000000..e72a265
--- /dev/null
+++ b/MPI/amrex/files/variants.rhel6
@@ -0,0 +1,15 @@
+amrex/18.07_2d	stable		gcc/7.3.0 openmpi/{1.10.7,2.1.5,3.0.0,3.1.2,3.1.3} b:cmake/3.9.6
+
+amrex/18.07_2d	stable		gcc/7.4.0 openmpi/3.1.4 b:cmake/3.10.3
+
+amrex/18.07_2d	stable		gcc/8.2.0 openmpi/{1.10.7,2.1.5,3.1.3} b:cmake/3.9.6
+
+amrex/18.07_2d	stable		gcc/{7.3.0,8.2.0} mpich/3.2.1 b:cmake/3.9.6
+
+amrex/18.07_3d	stable		gcc/7.3.0 openmpi/{1.10.7,2.1.5,3.0.0,3.1.2,3.1.3} b:cmake/3.9.6
+amrex/18.07_3d	stable		gcc/7.4.0 openmpi/3.1.4 b:cmake/3.10.3
+amrex/18.07_3d	stable		gcc/8.2.0 openmpi/{1.10.7,2.1.5,3.1.3} b:cmake/3.9.6
+amrex/18.07_3d	stable		gcc/{7.3.0,8.2.0} mpich/3.2.1 b:cmake/3.9.6
+
+amrex/18.07_3d	unstable	gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6 b:cmake/3.15.5
+