diff --git a/cgpuvm-attest/Cargo.toml b/cgpuvm-attest/Cargo.toml
index 9b540bf..abc04a7 100644
--- a/cgpuvm-attest/Cargo.toml
+++ b/cgpuvm-attest/Cargo.toml
@@ -16,6 +16,7 @@ tracing = "0.1"
 thiserror = "1"
 
 [dependencies.ohttp]
-path= "../ohttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["server"]
 default-features = false
\ No newline at end of file
diff --git a/cgpuvm-attest/src/err.rs b/cgpuvm-attest/src/err.rs
index 29d6749..e982501 100644
--- a/cgpuvm-attest/src/err.rs
+++ b/cgpuvm-attest/src/err.rs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 use thiserror::Error;
 
 #[derive(Error, Debug)]
diff --git a/cgpuvm-attest/src/lib.rs b/cgpuvm-attest/src/lib.rs
index 215a20b..9849a5a 100755
--- a/cgpuvm-attest/src/lib.rs
+++ b/cgpuvm-attest/src/lib.rs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 pub mod err;
 
 use err::AttestError;
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index e564b1a..4143df4 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,10 +1,7 @@
 FROM rust:1.75 AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -yq \
-ca-certificates coreutils curl git make mercurial \
-build-essential clang llvm libclang-dev lld \
-gyp ninja-build pkg-config zlib1g-dev libssl-dev
+RUN apt-get update && apt-get install -yq openssl libssl-dev
 
 WORKDIR /usr/src/ohttp
 COPY . .
diff --git a/ohttp-client/Cargo.toml b/ohttp-client/Cargo.toml
index 678e942..b5764d4 100644
--- a/ohttp-client/Cargo.toml
+++ b/ohttp-client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ohttp-client"
-version = "0.5.3"
-authors = ["Martin Thomson <mt@lowentropy.net>"]
+version = "0.1.0"
+authors = ["Kapil Vaswani <kapilv@microsoft.com>"]
 edition = "2021"
 
 [features]
@@ -30,12 +30,12 @@ infer = "0.16.0"
 path= "../verifier"
 
 [dependencies.bhttp]
-git = "https://github.com/kapilvgit/ohttp.git"
-branch = "kapilv/upstream"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["bhttp", "http"]
 
 [dependencies.ohttp]
-git = "https://github.com/kapilvgit/ohttp.git"
-branch = "kapilv/upstream"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["client"]
 default-features = false
diff --git a/ohttp-server/Cargo.toml b/ohttp-server/Cargo.toml
index e557b72..3d8019b 100644
--- a/ohttp-server/Cargo.toml
+++ b/ohttp-server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ohttp-server"
-version = "0.5.3"
-authors = ["Martin Thomson <mt@lowentropy.net>"]
+version = "0.1.0"
+authors = ["Kapil Vaswani <kapilv@microsoft.com>"]
 edition = "2021"
 
 [features]
@@ -32,15 +32,18 @@ tracing-subscriber = { version = "0.3.18", features = ["default", "json", "env-f
 thiserror = "1"
 uuid = { version = "1.0", features = ["v4"] }
 
+[dependencies.cgpuvm-attest]
+path= "../cgpuvm-attest"
+features = []
+
 [dependencies.bhttp]
-path= "../bhttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["bhttp", "write-http"]
 
 [dependencies.ohttp]
-path= "../ohttp"
+git = "https://github.com/microsoft/ohttp.git"
+branch = "main"
 features = ["server"]
 default-features = false
 
-[dependencies.cgpuvm-attest]
-path= "../cgpuvm-attest"
-features = []
diff --git a/ohttp-server/src/err.rs b/ohttp-server/src/err.rs
index 6a4db12..5c0b0ad 100644
--- a/ohttp-server/src/err.rs
+++ b/ohttp-server/src/err.rs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 use thiserror::Error;
 
 #[derive(Error, Debug)]
diff --git a/ohttp-server/src/main.rs b/ohttp-server/src/main.rs
index 65a7aa1..f662de4 100755
--- a/ohttp-server/src/main.rs
+++ b/ohttp-server/src/main.rs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #![deny(clippy::pedantic)]
 
 pub mod err;
diff --git a/scripts/service_wait.sh b/scripts/service_wait.sh
index e7fe4d3..9b1d7dd 100755
--- a/scripts/service_wait.sh
+++ b/scripts/service_wait.sh
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 #!/bin/bash
 
 SERVICE_HOST=$1