diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
index 72f0ce0c10c18f92fe4d46de9d22b50b49ff4aa8..c67bb0a04fcc8615a145a12acbcd086e4d07f78a 100644
--- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
+++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py
@@ -93,7 +93,7 @@ with CodeGeneration() as ctx:
         'aa_odd_split': True,
         'aa_odd_nt_stores': False,
 
-        'compiled_in_boundaries': True,
+        'compiled_in_boundaries': False,
     }
     config_name = ctx.config
     noopt = False
diff --git a/apps/benchmarks/UniformGridGenerated/params.py b/apps/benchmarks/UniformGridGenerated/params.py
index 90af64f57ebd9502f7190cdfb4c4564f86b4ff74..724238f4bb456be75906dafeff6b0683e4dbe3a4 100644
--- a/apps/benchmarks/UniformGridGenerated/params.py
+++ b/apps/benchmarks/UniformGridGenerated/params.py
@@ -64,7 +64,7 @@ class BenchmarkScenario:
 
     @wlb.member_callback
     def config(self, **kwargs):
-        time_steps_for_128_cubed = 50
+        time_steps_for_128_cubed = 10
         time_steps = int(128**3 / prod(self.block_size) * time_steps_for_128_cubed)
         time_steps = max(10, time_steps)
         cfg = {
@@ -73,8 +73,8 @@ class BenchmarkScenario:
             },
             'Parameters': {
                 'timesteps': time_steps,
-                'warmupSteps': 6,
-                'outerIterations': 3,
+                'warmupSteps': 2,
+                'outerIterations': 4,
                 'vtkWriteFrequency': 0,
                 'remainingTimeLoggerFrequency': 0,
                 'omega': 1.6,
@@ -136,14 +136,13 @@ def single_node_benchmark():
                         if not block_size_ok(sc):
                             continue
                         scenarios.add(sc)
-
-            else:
-                    sc = BenchmarkScenario(block_size=block_size, direct_comm=direct_comm,
-                                           domain_decomposition_func=domain_decomposition_func_z,
-                                           time_step_mode=time_step_mode)
-                    if not block_size_ok(sc):
-                        continue
-                    scenarios.add(sc)
+                else:
+                        sc = BenchmarkScenario(block_size=block_size, direct_comm=direct_comm,
+                                               domain_decomposition_func=domain_decomposition_func_z,
+                                               time_step_mode=time_step_mode)
+                        if not block_size_ok(sc):
+                            continue
+                        scenarios.add(sc)
 
 
 def single_node_benchmark_small():
@@ -169,5 +168,4 @@ def weak_scaling():
                 continue
             scenarios.add(sc)
 
-
 single_node_benchmark()