diff --git a/config/acme/allactive/config_pesall.xml b/config/acme/allactive/config_pesall.xml
index b280fdf6e5fe..a883f68f6786 100644
--- a/config/acme/allactive/config_pesall.xml
+++ b/config/acme/allactive/config_pesall.xml
@@ -1997,7 +1997,7 @@
     </mach>
   </grid>
   <grid name="a%360x720cru">
-    <mach name="redsky">
+    <mach name="redsky|cori-knl">
       <pes compset="any" pesize="any">
         <comment>none</comment>
         <ntasks>
diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
index a35d28681082..8f434727e6a7 100644
--- a/config/acme/machines/config_machines.xml
+++ b/config/acme/machines/config_machines.xml
@@ -361,8 +361,8 @@
       <cmd_path lang="csh">module</cmd_path>
       <modules>
 	<!--command name="rm">PrgEnv-intel</command-->
-	<command name="rm">PrgEnv-cray</command>
-	<command name="rm">PrgEnv-gnu</command>
+	<!--command name="rm">PrgEnv-cray</command-->
+	<!--command name="rm">PrgEnv-gnu</command-->
 	<command name="rm">intel</command>
 	<command name="rm">cce</command>
         <command name="rm">gcc</command>
@@ -394,15 +394,19 @@
       </modules>
 
       <modules compiler="cray">
+	<command name="rm">PrgEnv-intel</command>
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.0</command>
+	<command name="rm">cce</command>
+	<command name="load">cce/8.5.4</command>
       </modules>
       <modules compiler="gnu">
+	<command name="rm">PrgEnv-intel</command>
 	<command name="load">PrgEnv-gnu</command>
-	<command name="switch">gcc gcc/6.2.0</command>
+	<command name="rm">gcc</command>
+	<command name="load">gcc/6.3.0</command>
       </modules>
       <modules compiler="!intel">
-	<command name="switch">cray-libsci/16.09.1</command>
+	<command name="load">cray-libsci/16.09.1</command>
       </modules>
 
       <modules>