diff --git a/build.Dockerfile b/build.Dockerfile
index 214af47795..cbb3525056 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -35,6 +35,9 @@ ENV CARGO_NET_GIT_FETCH_WITH_CLI true
 ARG SGX_MODE=SW
 ENV SGX_MODE=$SGX_MODE
 
+ARG WORKER_FEATURES_ARG
+ENV WORKER_FEATURES=$WORKER_FEATURES_ARG
+
 ENV WORKHOME=/home/ubuntu/work
 ENV HOME=/home/ubuntu
 
@@ -57,7 +60,7 @@ WORKDIR $WORKHOME/worker
 COPY . .
 
 RUN --mount=type=cache,id=cargo-registry,target=/opt/rust/registry \
-    --mount=type=cache,id=cargo-git,target=/opt/rust/git/db \
+	--mount=type=cache,id=cargo-git,target=/opt/rust/git/db \
 	--mount=type=cache,id=cargo-sccache-${WORKER_MODE}${ADDITIONAL_FEATURES},target=/home/ubuntu/.cache/sccache \
 	echo ${FINGERPRINT} && make && cargo test --release && sccache --show-stats
 
@@ -65,6 +68,8 @@ RUN --mount=type=cache,id=cargo-registry,target=/opt/rust/registry \
 ### The runner needs the aesmd service for the `SGX_MODE=HW`.
 ######################################################
 FROM oasisprotocol/aesmd:master AS runner
+ENV SGX_SDK /opt/sgxsdk
+ENV LD_LIBRARY_PATH "${SGX_SDK}/sdk_libs"
 
 ### Deployed CLI client
 ##################################################
diff --git a/service/src/main.rs b/service/src/main.rs
index 7acf39ec9e..b831d63654 100644
--- a/service/src/main.rs
+++ b/service/src/main.rs
@@ -765,10 +765,10 @@ fn register_collateral(
 		let (fmspc, _tcb_info) = extract_tcb_info_from_raw_dcap_quote(&dcap_quote).unwrap();
 
 		let uxt = enclave.generate_register_quoting_enclave_extrinsic(fmspc).unwrap();
-		send_extrinsic(&uxt, api, accountid, is_development_mode);
+		send_extrinsic(uxt, api, accountid, is_development_mode);
 
 		let uxt = enclave.generate_register_tcb_info_extrinsic(fmspc).unwrap();
-		send_extrinsic(&uxt, api, accountid, is_development_mode);
+		send_extrinsic(uxt, api, accountid, is_development_mode);
 	}
 }