diff --git a/.gitignore b/.gitignore
index 57d18ea..5c5464a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@
 **/*.cbp
 **/CMakeScripts
 **/compile_commands.json
+
+!go.mod
diff --git a/attachments/envoy/1.32/build_template b/attachments/envoy/1.32/build_template
index f8e99ec..d54bb36 100755
--- a/attachments/envoy/1.32/build_template
+++ b/attachments/envoy/1.32/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CC=gcc-5 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}'"
+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/envoy/1.33/build_template b/attachments/envoy/1.33/build_template
index f8e99ec..d54bb36 100755
--- a/attachments/envoy/1.33/build_template
+++ b/attachments/envoy/1.33/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CC=gcc-5 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}'"
+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/envoy/1.34/build_template b/attachments/envoy/1.34/build_template
index f8e99ec..d54bb36 100755
--- a/attachments/envoy/1.34/build_template
+++ b/attachments/envoy/1.34/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CC=gcc-5 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}'"
+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/envoy/1.35/build_template b/attachments/envoy/1.35/build_template
index f8e99ec..d54bb36 100755
--- a/attachments/envoy/1.35/build_template
+++ b/attachments/envoy/1.35/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CC=gcc-5 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}'"
+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/envoy/1.35/go.mod b/attachments/envoy/1.35/go.mod
new file mode 100644
index 0000000..308bf7a
--- /dev/null
+++ b/attachments/envoy/1.35/go.mod
@@ -0,0 +1,20 @@
+module gitlab.ngen.checkpoint.com/Ngen/agent-core/attachments/envoy
+
+// the version should >= 1.18
+go 1.24
+
+// NOTICE: these lines could be generated automatically by "go mod tidy"
+require (
+	github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa
+	github.com/envoyproxy/envoy v1.35.6
+	google.golang.org/protobuf v1.36.6
+)
+
+require github.com/go-chi/chi/v5 v5.1.0
+
+require (
+	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
+)
diff --git a/attachments/envoy/1.36/build_template b/attachments/envoy/1.36/build_template
index f8e99ec..d54bb36 100755
--- a/attachments/envoy/1.36/build_template
+++ b/attachments/envoy/1.36/build_template
@@ -10,4 +10,4 @@ ENVOY_ATTACHMENT_DIR="@ENVOY_ATTACHMENT_DIR@"
 cd $ENVOY_ATTACHMENT_DIR
 
 # Run the go build command
-CC=gcc-5 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}'"
+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/envoy/1.36/go.mod b/attachments/envoy/1.36/go.mod
new file mode 100644
index 0000000..b7016e7
--- /dev/null
+++ b/attachments/envoy/1.36/go.mod
@@ -0,0 +1,20 @@
+module gitlab.ngen.checkpoint.com/Ngen/agent-core/attachments/envoy
+
+// the version should >= 1.18
+go 1.24
+
+// NOTICE: these lines could be generated automatically by "go mod tidy"
+require (
+	github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa
+	github.com/envoyproxy/envoy v1.36.2
+	google.golang.org/protobuf v1.36.10
+)
+
+require github.com/go-chi/chi/v5 v5.1.0
+
+require (
+	github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
+)