diff --git a/attachments/envoy/build_template b/attachments/envoy/build_template
index d54bb36..4674809 100644
--- a/attachments/envoy/build_template
+++ b/attachments/envoy/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CGO_CFLAGS="-I@ATTACHMENTS_INCLUDE_DIR@ -I@NANO_ATTACHMENT_INCLUDE_DIR@" go build -o ${ENVOY_ATTACHMENT_DIR}/libenvoy_attachment.so -buildmode=c-shared -ldflags="-extldflags '-L${SHMEM_LIBRARY_DIR} -L${NANO_ATTACHMENT_LIBRARY_DIR} -L${NANO_ATTACHMENT_UTIL_LIBRARY_DIR} ${LIBRARIES}'"
+CC=gcc CGO_CFLAGS="-I@ATTACHMENTS_INCLUDE_DIR@ -I@NANO_ATTACHMENT_INCLUDE_DIR@" go build -o ${ENVOY_ATTACHMENT_DIR}/libenvoy_attachment.so -buildmode=c-shared -ldflags="-extldflags '-L${SHMEM_LIBRARY_DIR} -L${NANO_ATTACHMENT_LIBRARY_DIR} -L${NANO_ATTACHMENT_UTIL_LIBRARY_DIR} ${LIBRARIES}'"
diff --git a/attachments/nano_attachment/CMakeLists.txt b/attachments/nano_attachment/CMakeLists.txt
index a63649b..150d1f8 100644
--- a/attachments/nano_attachment/CMakeLists.txt
+++ b/attachments/nano_attachment/CMakeLists.txt
@@ -26,7 +26,6 @@ add_library(
 target_link_libraries(nano_attachment shmem_ipc_2 nano_attachment_util)
 
 # add_subdirectory(nano_attachment_ut)
-# add_subdirectory(manual_testing)
 
 install(TARGETS nano_attachment DESTINATION lib)
 install(TARGETS nano_attachment DESTINATION http_transaction_handler_service/lib/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ)