diff --git a/pytato/codegen.py b/pytato/codegen.py
index 86a84f25f8d8511899938d671a0774f3629ce8fc..54c1503ce10f382c87673f418258eed6cb7e4ac1 100644
--- a/pytato/codegen.py
+++ b/pytato/codegen.py
@@ -377,7 +377,7 @@ class CodeGenMapper(pytato.transform.Mapper):
         out = lp.TemporaryVariable(out_name,
                 dtype=expr.dtype,
                 shape=expr.shape,
-                address_space=lp.AddressSpace.GLOBAL)
+                address_space=lp.auto)
 
         inames = []
         for j in range(expr.ndim - 1):
@@ -641,7 +641,7 @@ def add_store(name: str, expr: Array, result: ImplementedResult,
         tvar = lp.TemporaryVariable(name,
                 dtype=expr.dtype,
                 shape=expr.shape,
-                address_space=lp.AddressSpace.GLOBAL)
+                address_space=lp.auto)
         temporary_variables = kernel.temporary_variables.copy()
         temporary_variables[name] = tvar
         kernel = kernel.copy(temporary_variables=temporary_variables,