diff --git a/attachments/envoy/1.31/CMakeLists.txt b/attachments/envoy/1.31/CMakeLists.txt
index b7e2bb3..ece37c7 100755
--- a/attachments/envoy/1.31/CMakeLists.txt
+++ b/attachments/envoy/1.31/CMakeLists.txt
@@ -1,4 +1,4 @@
-if("${PLATFORM_TYPE}" STREQUAL "x86" AND "${ATTACHMENT_TYPE}" STREQUAL "envoy")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ATTACHMENT_TYPE STREQUAL "envoy")
     set(ATTACHMENTS_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/core/include/attachments)
     set(NANO_ATTACHMENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/attachments/nano_attachment)
     set(SHMEM_LIBRARY_DIR ${CMAKE_BINARY_DIR}/core/shmem_ipc_2)
diff --git a/attachments/envoy/1.31/go.mod b/attachments/envoy/1.31/go.mod
new file mode 100755
index 0000000..6ae9151
--- /dev/null
+++ b/attachments/envoy/1.31/go.mod
@@ -0,0 +1,20 @@
+module gitlab.ngen.checkpoint.com/Ngen/agent-core/attachments/envoy
+
+// the version should >= 1.18
+go 1.20
+
+// 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.31.0
+	google.golang.org/protobuf v1.34.2
+)
+
+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.32/CMakeLists.txt b/attachments/envoy/1.32/CMakeLists.txt
index b7e2bb3..ece37c7 100755
--- a/attachments/envoy/1.32/CMakeLists.txt
+++ b/attachments/envoy/1.32/CMakeLists.txt
@@ -1,4 +1,4 @@
-if("${PLATFORM_TYPE}" STREQUAL "x86" AND "${ATTACHMENT_TYPE}" STREQUAL "envoy")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ATTACHMENT_TYPE STREQUAL "envoy")
     set(ATTACHMENTS_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/core/include/attachments)
     set(NANO_ATTACHMENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/attachments/nano_attachment)
     set(SHMEM_LIBRARY_DIR ${CMAKE_BINARY_DIR}/core/shmem_ipc_2)
diff --git a/attachments/envoy/1.32/go.mod b/attachments/envoy/1.32/go.mod
new file mode 100755
index 0000000..c5350ff
--- /dev/null
+++ b/attachments/envoy/1.32/go.mod
@@ -0,0 +1,22 @@
+module gitlab.ngen.checkpoint.com/Ngen/agent-core/attachments/envoy
+
+// the version should >= 1.18
+go 1.22
+
+toolchain go1.22.5
+
+// 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.32.1
+	google.golang.org/protobuf v1.35.1
+)
+
+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.33/CMakeLists.txt b/attachments/envoy/1.33/CMakeLists.txt
index b7e2bb3..ece37c7 100755
--- a/attachments/envoy/1.33/CMakeLists.txt
+++ b/attachments/envoy/1.33/CMakeLists.txt
@@ -1,4 +1,4 @@
-if("${PLATFORM_TYPE}" STREQUAL "x86" AND "${ATTACHMENT_TYPE}" STREQUAL "envoy")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ATTACHMENT_TYPE STREQUAL "envoy")
     set(ATTACHMENTS_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/core/include/attachments)
     set(NANO_ATTACHMENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/attachments/nano_attachment)
     set(SHMEM_LIBRARY_DIR ${CMAKE_BINARY_DIR}/core/shmem_ipc_2)
diff --git a/attachments/envoy/1.33/go.mod b/attachments/envoy/1.33/go.mod
new file mode 100755
index 0000000..0f67560
--- /dev/null
+++ b/attachments/envoy/1.33/go.mod
@@ -0,0 +1,22 @@
+module gitlab.ngen.checkpoint.com/Ngen/agent-core/attachments/envoy
+
+// the version should >= 1.18
+go 1.22
+
+toolchain go1.22.5
+
+// 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.33.0
+	google.golang.org/protobuf v1.36.1
+)
+
+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
+)