diff --git a/config/surf_snellius.py b/config/surf_snellius.py
index f17d86e8..caef561d 100644
--- a/config/surf_snellius.py
+++ b/config/surf_snellius.py
@@ -19,12 +19,6 @@
                     'access':  ['-p thin', '--export=None'],
                     'environs': ['default'],
                     'max_jobs': 120,
-                    'processor': {
-                        'num_cpus': 128,
-                        'num_sockets': 2,
-                        'num_cpus_per_socket': 64,
-                        'arch': 'zen2',
-                    },
                     'features': [
                         'cpu',
                     ],
@@ -34,16 +28,10 @@
                     'name': 'gpu',
                     'scheduler': 'slurm',
                     'prepare_cmds': ['source /cvmfs/pilot.eessi-hpc.org/latest/init/bash'],
-                    'launcher': 'srun',
+                    'launcher': 'mpirun',
                     'access':  ['-p gpu', '--export=None'],
                     'environs': ['default'],
                     'max_jobs': 60,
-                    'processor': {
-                        'num_cpus': 72,
-                        'num_sockets': 2,
-                        'num_cpus_per_socket': 36,
-                        'arch': 'icelake',
-                    },
                     'devices': [
                         {
                             'type': 'gpu',
@@ -109,4 +97,12 @@
             ]
         }
     ],
+    'general': [
+        {
+            # For autodetect to work, temporarily change:
+            # 1. The launchers to srun
+            # 2. Add --exclusive to GPU 'access' field above (avoids submission error that no GPUs are requested)
+            'remote_detect': True,
+        }
+    ],
 }