diff --git a/cases/icon-test/config.yaml b/cases/icon-test/config.yaml
index 25253c62..1a2b6915 100644
--- a/cases/icon-test/config.yaml
+++ b/cases/icon-test/config.yaml
@@ -2,6 +2,7 @@
 
 model: icon
 constraint: gpu
+run_on: gpu
 compute_queue: normal
 ntasks_per_node: 12
 restart_step: 6
@@ -44,7 +45,7 @@ icon:
     binary_file: ./src/icon/bin/icon
     runjob_filename: icon_runjob.cfg
     compute_queue: normal
-    walltime: '00:20:00'
+    walltime: '00:30:00'
     np_tot: 6
     np_io: 1
     np_restart: 1
diff --git a/cases/icon-test/icon_runjob.cfg b/cases/icon-test/icon_runjob.cfg
index b7eaa0e7..c2f8f787 100755
--- a/cases/icon-test/icon_runjob.cfg
+++ b/cases/icon-test/icon_runjob.cfg
@@ -3,9 +3,7 @@
 #SBATCH --account={cfg.compute_account}
 #SBATCH --time={cfg.icon_walltime}
 #SBATCH --nodes={cfg.icon_np_tot}
-#SBATCH --ntasks-per-core=1
 #SBATCH --ntasks-per-node={cfg.ntasks_per_node}
-#SBATCH --cpus-per-task=1
 #SBATCH --partition={cfg.compute_queue}
 #SBATCH --constraint={cfg.constraint}
 #SBATCH --hint=nomultithread
@@ -96,6 +94,7 @@ cat > NAMELIST_{cfg.casename} << EOF
  lart                        =                     .FALSE.        ! main switch for ART
  debug_check_level           =                         10
  restart_filename = "{cfg.icon_restart_out}/{cfg.output_filename}_<rsttime>.nc"
+ activate_sync_timers = .TRUE.
 /
 
 ! diffusion_nml: horizontal (numerical) diffusion ----------------------------
@@ -168,7 +167,7 @@ cat > NAMELIST_{cfg.casename} << EOF
  itype_pres_msl              =                          5         ! method for computation of mean sea level pressure
  itype_rh                    =                          1         ! method for computation of relative humidity
  lmask_boundary              =                      .TRUE.        ! mask out interpolation zone in output
- restart_file_type           =                          5
+ restart_file_type           =                          4
 /
 
 ! limarea_nml: settings for limited area mode ---------------------------------
diff --git a/run_chain.py b/run_chain.py
index 35fca10c..299cc880 100755
--- a/run_chain.py
+++ b/run_chain.py
@@ -148,10 +148,20 @@ def set_account(self):
 
     def set_node_info(self):
         if self.constraint == 'gpu':
-            self.ntasks_per_node = 12
-            self.mpich_cuda = ('export MPICH_RDMA_ENABLED_CUDA=1\n'
-                               'export MPICH_G2G_PIPELINE=256\n'
-                               'export CRAY_CUDA_MPS=1\n')
+            if self.model.startswith('icon'):
+                if self.run_on == 'gpu':
+                    self.ntasks_per_node = 1
+                elif self.run_on == 'cpu':
+                    self.ntasks_per_node = 12
+                else:
+                    raise ValueError(
+                        "Invalid value for 'run_on' in the configuration."
+                        "It should be either 'gpu' or 'cpu'.")
+            else:
+                self.ntasks_per_node = 12
+                self.mpich_cuda = ('export MPICH_RDMA_ENABLED_CUDA=1\n'
+                                   'export MPICH_G2G_PIPELINE=256\n'
+                                   'export CRAY_CUDA_MPS=1\n')
         elif self.constraint == 'mc':
             self.ntasks_per_node = 36
             self.mpich_cuda = ''