diff --git a/crates/node/src/storage/database/postgres.rs b/crates/node/src/storage/database/postgres.rs
index c5521aec..9461cdb4 100644
--- a/crates/node/src/storage/database/postgres.rs
+++ b/crates/node/src/storage/database/postgres.rs
@@ -9,7 +9,7 @@ use super::entity::{self};
 use crate::types::{self, transaction::ProgramData, File, Hash, Program, Task};
 
 const MAX_DB_CONNS: u32 = 64;
-const DB_CONNECT_TIMEOUT: Duration = Duration::from_millis(750);
+const DB_CONNECT_TIMEOUT: Duration = Duration::from_secs(30);
 
 #[derive(Clone)]
 pub struct Database {
diff --git a/crates/shim/src/lib.rs b/crates/shim/src/lib.rs
index 217a0bbd..a7c9ae4e 100644
--- a/crates/shim/src/lib.rs
+++ b/crates/shim/src/lib.rs
@@ -233,7 +233,7 @@ impl GRPCClient {
             path: name.to_string(),
         };
 
-        let file_path = Path::new(&self.workspace).join(task_id).join(name);
+        let file_path = Path::new(&self.workspace).join(name);
         if let Some(parent) = file_path.parent() {
             if let Ok(false) = tokio::fs::try_exists(parent).await {
                 if let Err(err) = tokio::fs::create_dir_all(parent).await {