diff --git a/release/files_common b/release/files_common
index edb37bc0de..547bb58144 100644
--- a/release/files_common
+++ b/release/files_common
@@ -580,17 +580,13 @@ opendbc/tesla_can.dbc
 opendbc/tesla_radar.dbc
 opendbc/tesla_powertrain.dbc
 
-tinygrad_repo/openpilot/compile.py
 tinygrad_repo/accel/opencl/*
+tinygrad_repo/tinygrad/llops/ops_opencl.py
+tinygrad_repo/openpilot/compile.py
 tinygrad_repo/extra/onnx.py
 tinygrad_repo/extra/thneed.py
 tinygrad_repo/extra/utils.py
 tinygrad_repo/tinygrad/llops/ops_gpu.py
-tinygrad_repo/tinygrad/llops/ops_opencl.py
-tinygrad_repo/tinygrad/helpers.py
-tinygrad_repo/tinygrad/mlops.py
-tinygrad_repo/tinygrad/ops.py
-tinygrad_repo/tinygrad/shapetracker.py
-tinygrad_repo/tinygrad/tensor.py
-tinygrad_repo/tinygrad/nn/__init__.py
-tinygrad_repo/tinygrad/nn/optim.py
+tinygrad_repo/tinygrad/shape/*
+tinygrad_repo/tinygrad/nn/*
+tinygrad_repo/tinygrad/*.py
diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript
index 82338e456b..7bbc1b3477 100644
--- a/selfdrive/modeld/SConscript
+++ b/selfdrive/modeld/SConscript
@@ -70,30 +70,14 @@ lenv.Program('_dmonitoringmodeld', [
 if use_thneed and arch == "larch64" or GetOption('pc_thneed'):
   fn = File("models/supercombo").abspath
 
-  if GetOption('pc_thneed'):
-    cmd = f"cd {Dir('#').abspath}/tinygrad_repo && GPU=1 NATIVE_EXPLOG=1 OPTWG=1 UNSAFE_FLOAT4=1 DEBUGCL=1 python3 openpilot/compile.py {fn}.onnx {fn}.thneed"
-  else:
-    cmd = f"cd {Dir('#').abspath}/tinygrad_repo && FLOAT16=1 MATMUL=1 PYOPENCL_NO_CACHE=1 NATIVE_EXPLOG=1 OPTWG=1 UNSAFE_FLOAT4=1 DEBUGCL=1 python3 openpilot/compile.py {fn}.onnx {fn}.thneed"
-
-  # is there a better way then listing all of tinygrad?
-  lenv.Command(fn + ".thneed", [fn + ".onnx",
-    "#tinygrad_repo/openpilot/compile.py",
-    "#tinygrad_repo/accel/opencl/conv.cl",
-    "#tinygrad_repo/accel/opencl/matmul.cl",
-    "#tinygrad_repo/accel/opencl/ops_opencl.py",
-    "#tinygrad_repo/accel/opencl/preprocessing.py",
-    "#tinygrad_repo/extra/onnx.py",
-    "#tinygrad_repo/extra/thneed.py",
-    "#tinygrad_repo/extra/utils.py",
-    "#tinygrad_repo/tinygrad/llops/ops_gpu.py",
-    "#tinygrad_repo/tinygrad/llops/ops_opencl.py",
-    "#tinygrad_repo/tinygrad/helpers.py",
-    "#tinygrad_repo/tinygrad/mlops.py",
-    "#tinygrad_repo/tinygrad/ops.py",
-    "#tinygrad_repo/tinygrad/shapetracker.py",
-    "#tinygrad_repo/tinygrad/tensor.py",
-    "#tinygrad_repo/tinygrad/nn/__init__.py"
-  ], cmd)
+  tinygrad_opts = ["NATIVE_EXPLOG=1", "VALIDHACKS=1", "OPTWG=1", "IMAGE=2", "GPU=1", "CLCACHE=0"]
+  if not GetOption('pc_thneed'):
+    # use FLOAT16 on device for speed + don't cache the CL kernels for space
+    tinygrad_opts += ["FLOAT16=1", "PYOPENCL_NO_CACHE=1"]
+  cmd = f"cd {Dir('#').abspath}/tinygrad_repo && " + ' '.join(tinygrad_opts) + f" python3 openpilot/compile.py {fn}.onnx {fn}.thneed"
+
+  tinygrad_files = sum([lenv.Glob("#"+x) for x in open(File("#release/files_common").abspath).read().split("\n") if x.startswith("tinygrad_repo/")], [])
+  lenv.Command(fn + ".thneed", [fn + ".onnx"] + tinygrad_files, cmd)
 
 llenv = lenv.Clone()
 if GetOption('pc_thneed'):
@@ -116,4 +100,4 @@ llenv.Program('_modeld', [
 lenv.Program('_navmodeld', [
     "navmodeld.cc",
     "models/nav.cc",
-  ]+common_model, LIBS=libs + transformations)
\ No newline at end of file
+  ]+common_model, LIBS=libs + transformations)
diff --git a/selfdrive/test/process_replay/model_replay_ref_commit b/selfdrive/test/process_replay/model_replay_ref_commit
index 22e021dcaf..9eefc73792 100644
--- a/selfdrive/test/process_replay/model_replay_ref_commit
+++ b/selfdrive/test/process_replay/model_replay_ref_commit
@@ -1 +1 @@
-db587bfef2317c5a3471632ac47381457e1be853
\ No newline at end of file
+8233a12f97f483645e7691b8c54552a2f861a7ad
diff --git a/tinygrad_repo b/tinygrad_repo
index 8e22d5ee67..2e1d47b166 160000
--- a/tinygrad_repo
+++ b/tinygrad_repo
@@ -1 +1 @@
-Subproject commit 8e22d5ee675277181e1eff644dde9e844fc40fce
+Subproject commit 2e1d47b16625ff343516287cdd9e4bcb26f5c4ef