diff --git a/README.md b/README.md
index ec3c2f9..259198e 100644
--- a/README.md
+++ b/README.md
@@ -86,8 +86,8 @@ Requirements:
 
 **Latest (CLI):**
 
-- `Mac`: arm64: [fluentci_v0.16.2_aarch64-apple-darwin.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.2/fluentci_v0.16.2_aarch64-apple-darwin.tar.gz) intel: [fluentci_v0.16.2_x86_64-apple-darwin.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.2/fluentci_v0.16.2_x86_64-apple-darwin.tar.gz)
-- `Linux`: intel: [fluentci_v0.16.2_x86_64-unknown-linux-gnu.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.2/fluentci_v0.16.2_x86_64-unknown-linux-gnu.tar.gz) arm64: [fluentci_v0.16.2_aarch64-unknown-linux-gnu.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.2/fluentci_v0.16.2_aarch64-unknown-linux-gnu.tar.gz)
+- `Mac`: arm64: [fluentci_v0.16.3_aarch64-apple-darwin.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.3/fluentci_v0.16.3_aarch64-apple-darwin.tar.gz) intel: [fluentci_v0.16.3_x86_64-apple-darwin.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.3/fluentci_v0.16.3_x86_64-apple-darwin.tar.gz)
+- `Linux`: intel: [fluentci_v0.16.3_x86_64-unknown-linux-gnu.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.3/fluentci_v0.16.3_x86_64-unknown-linux-gnu.tar.gz) arm64: [fluentci_v0.16.3_aarch64-unknown-linux-gnu.tar.gz](https://github.com/fluentci-io/fluentci/releases/download/v0.16.3/fluentci_v0.16.3_aarch64-unknown-linux-gnu.tar.gz)
 
 ## ✨ Quick Start
 
@@ -110,7 +110,7 @@ fluentci studio
 fluentci --help
 
 Usage:   fluentci [pipeline] [jobs...]
-Version: 0.16.2                      
+Version: 0.16.3                      
 
 Description:
 
diff --git a/src/cmd/agent.ts b/src/cmd/agent.ts
index 1a4416a..999b69a 100644
--- a/src/cmd/agent.ts
+++ b/src/cmd/agent.ts
@@ -95,9 +95,7 @@ async function startAgent() {
 
           await spawnFluentCI(
             logger,
-            `${dir("home")}/.fluentci/builds/${id}/${repoUrl
-              .split("/")
-              .pop()}/${workDir || "."}`,
+            `${dir("home")}/.fluentci/builds/${id}/${workDir || "."}`,
             pipeline,
             jobs,
             runId,
@@ -195,13 +193,10 @@ async function extractZipBlob(blob: Blob, project_id: string, sha256: string) {
 }
 
 async function gitClone(url: string, id: string, branch?: string) {
-  await Deno.mkdir(`${dir("home")}/.fluentci/builds/${id}`, {
-    recursive: true,
-  });
   await setupPkgx();
   const git = new Deno.Command("pkgx", {
-    args: ["git", "clone", url],
-    cwd: `${dir("home")}/.fluentci/builds/${id}`,
+    args: ["git", "clone", url, id],
+    cwd: `${dir("home")}/.fluentci/builds`,
     stdout: "inherit",
     stderr: "inherit",
   });
@@ -209,7 +204,7 @@ async function gitClone(url: string, id: string, branch?: string) {
   if (branch) {
     await new Deno.Command("pkgx", {
       args: ["git", "checkout", branch],
-      cwd: `${dir("home")}/.fluentci/builds/${id}/${url.split("/").pop()}`,
+      cwd: `${dir("home")}/.fluentci/builds/${id}`,
       stdout: "inherit",
       stderr: "inherit",
     }).spawn().status;
diff --git a/src/consts.ts b/src/consts.ts
index d52fd15..4a2632f 100644
--- a/src/consts.ts
+++ b/src/consts.ts
@@ -1,5 +1,5 @@
 import { dir } from "../deps.ts";
-export const VERSION = "0.16.2";
+export const VERSION = "0.16.3";
 
 export const BASE_URL = "https://api.fluentci.io/v1";