diff --git a/core/siren-core-env.el b/core/siren-core-env.el
index 638fe11..aad4333 100644
--- a/core/siren-core-env.el
+++ b/core/siren-core-env.el
@@ -8,9 +8,24 @@
 ;;; Code:
 
 (use-package exec-path-from-shell
+  :custom
+  (exec-path-from-shell-variables '("PATH"
+                                    "MANPATH"
+                                    "TMPDIR"
+                                    "GOPATH"
+                                    "KUBECONFIG"))
+  (exec-path-from-shell-arguments '("-l"))
+  (exec-path-from-shell-check-startup-files nil)
+  (exec-path-from-shell-debug nil)
+
   :config
   (when (memq window-system '(mac ns x))
     (exec-path-from-shell-initialize)))
 
+;; Set temporary-file-directory to match TMPDIR environment variable
+(let ((tmpdir (getenv "TMPDIR")))
+  (when (and tmpdir (not (string-blank-p tmpdir)))
+    (setq temporary-file-directory tmpdir)))
+
 (provide 'siren-core-env)
 ;;; siren-core-env.el ends here