diff --git a/llama_toolchain/agentic_system/meta_reference/agentic_system.py b/llama_toolchain/agentic_system/meta_reference/agentic_system.py
index 4fa2aa584..09fbfdde5 100644
--- a/llama_toolchain/agentic_system/meta_reference/agentic_system.py
+++ b/llama_toolchain/agentic_system/meta_reference/agentic_system.py
@@ -6,7 +6,7 @@
 
 
 import logging
-import os
+import tempfile
 import uuid
 from typing import AsyncGenerator
 
@@ -71,7 +71,7 @@ class MetaReferenceAgenticSystemImpl(AgenticSystem):
                 tool = CodeInterpreterTool()
             elif isinstance(tool_defn, PhotogenToolDefinition):
                 tool = PhotogenTool(
-                    dump_dir="/tmp/photogen_dump_" + os.environ["USER"],
+                    dump_dir=tempfile.mkdtemp(),
                 )
             else:
                 continue
diff --git a/llama_toolchain/core/build_container.sh b/llama_toolchain/core/build_container.sh
index b864e7098..ec2ca8a0c 100755
--- a/llama_toolchain/core/build_container.sh
+++ b/llama_toolchain/core/build_container.sh
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \
        curl wget telnet \
        procps psmisc lsof \
        traceroute \
+       bubblewrap \
        && rm -rf /var/lib/apt/lists/*
 
 EOF
diff --git a/llama_toolchain/tools/builtin.py b/llama_toolchain/tools/builtin.py
index f2ddeefa7..3a53e2e26 100644
--- a/llama_toolchain/tools/builtin.py
+++ b/llama_toolchain/tools/builtin.py
@@ -5,8 +5,8 @@
 # the root directory of this source tree.
 
 import json
-import os
 import re
+import tempfile
 
 from abc import abstractmethod
 from typing import List, Optional
@@ -284,7 +284,7 @@ class WolframAlphaTool(SingleMessageBuiltinTool):
 class CodeInterpreterTool(BaseTool):
     def __init__(self) -> None:
         ctx = CodeExecutionContext(
-            matplotlib_dump_dir=f"/tmp/{os.environ['USER']}_matplotlib_dump",
+            matplotlib_dump_dir=tempfile.mkdtemp(),
         )
         self.code_executor = CodeExecutor(ctx)
 
diff --git a/setup.py b/setup.py
index f909be9bf..c144a1720 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def read_requirements():
 
 setup(
     name="llama_toolchain",
-    version="0.0.12",
+    version="0.0.13",
     author="Meta Llama",
     author_email="llama-oss@meta.com",
     description="Llama toolchain",