diff --git a/config/aws_citc.py b/config/aws_citc.py
index 7b411fd5..6bd44062 100644
--- a/config/aws_citc.py
+++ b/config/aws_citc.py
@@ -118,6 +118,8 @@
     'logging': common_logging_config(reframe_prefix),
     'general': [
         {
+            # Enable automatic detection of CPU architecture for each partition
+            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
             'remote_detect': True,
         }
     ],
@@ -126,12 +128,6 @@
 # Add default things to each partition:
 partition_defaults = {
     'scheduler': 'squeue',
-    # mpirun causes problems with cpu autodetect, since there is no system mpirun.
-    # See https://github.com/EESSI/test-suite/pull/53#issuecomment-1590849226
-    # and this feature request https://github.com/reframe-hpc/reframe/issues/2926
-    # However, using srun requires either using pmix or proper pmi2 integration in the MPI library
-    # See https://github.com/EESSI/test-suite/pull/53#issuecomment-1598753968
-    # Thus, we use mpirun for now, and manually swap to srun if we want to autodetect CPUs...
     'launcher': 'mpirun',
     'environs': ['default'],
     'features': [
diff --git a/config/izum_vega.py b/config/izum_vega.py
index 1fb9ecd5..ca3e2179 100644
--- a/config/izum_vega.py
+++ b/config/izum_vega.py
@@ -24,13 +24,6 @@
 
 # This is an example configuration file
 site_configuration = {
-    'general': [
-        {
-            # Enable automatic detection of CPU architecture for each partition
-            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
-            'remote_detect': True,
-        }
-    ],
     'systems': [
         {
             'name': 'vega',
@@ -109,4 +102,11 @@
         },
     ],
     'logging': common_logging_config(reframe_prefix),
+    'general': [
+        {
+            # Enable automatic detection of CPU architecture for each partition
+            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
+            'remote_detect': True,
+        }
+    ],
 }
diff --git a/config/settings_example.py b/config/settings_example.py
index af910605..219efbcd 100644
--- a/config/settings_example.py
+++ b/config/settings_example.py
@@ -1,3 +1,19 @@
+# WARNING: for CPU autodetect to work correctly you need to
+# 1. Either use ReFrame >= 4.3.3 or temporarily change the 'launcher' for each partition to srun
+# 2. Either use ReFrame >= 4.3.3 or run from a clone of the ReFrame repository
+# If your system has a GPU partition, it might force jobs to request at least one GPU. If that is the
+# case, you also need to temporarily change 'access' field for the GPU partition to include the request
+# for one GPU, e.g. 'access':  ['-p gpu', '--export=None', '--gres=gpu:1'],
+
+# Without this, the autodetect job fails because
+# 1. A missing mpirun command
+# 2. An incorrect directory structure is assumed when preparing the stagedir for the autodetect job
+
+# Related issues
+# 1. https://github.com/reframe-hpc/reframe/issues/2926
+# 2. https://github.com/reframe-hpc/reframe/issues/2914
+
+
 """
 Example configuration file
 """
@@ -79,6 +95,13 @@
         },
     ],
     'logging': common_logging_config(),
+    'general': [
+        {
+            # Enable automatic detection of CPU architecture for each partition
+            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
+            'remote_detect': True,
+        }
+    ],
 }
 
 # optional logging to syslog
diff --git a/config/surf_snellius.py b/config/surf_snellius.py
index 966807a8..d15d2a6d 100644
--- a/config/surf_snellius.py
+++ b/config/surf_snellius.py
@@ -24,13 +24,6 @@
 
 # This is an example configuration file
 site_configuration = {
-    'general': [
-        {
-            # Enable automatic detection of CPU architecture for each partition
-            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
-            'remote_detect': True,
-        }
-    ],
     'systems': [
         {
             'name': 'snellius',
@@ -107,4 +100,11 @@
         },
     ],
     'logging': common_logging_config(reframe_prefix),
+    'general': [
+        {
+            # Enable automatic detection of CPU architecture for each partition
+            # See https://reframe-hpc.readthedocs.io/en/stable/configure.html#auto-detecting-processor-information
+            'remote_detect': True,
+        }
+    ],
 }