diff --git a/package/go/go-bin/go-bin.mk b/package/go/go-bin/go-bin.mk
index a0f1e26e8f..ac42e4cbf3 100644
--- a/package/go/go-bin/go-bin.mk
+++ b/package/go/go-bin/go-bin.mk
@@ -4,12 +4,15 @@
 #
 ################################################################################
 
+GO_BIN_VERSION = $(GO_VERSION)
 GO_BIN_SITE = https://go.dev/dl
 GO_BIN_SOURCE = go$(GO_VERSION).linux-$(call qstrip, $(BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH)).tar.gz
 GO_BIN_DL_SUBDIR = go
 HOST_GO_BIN_ACTUAL_SOURCE_TARBALL = go$(GO_VERSION).src.tar.gz
 GO_BIN_LICENSE = BSD-3-Clause
 GO_BIN_LICENSE_FILES = LICENSE
+GO_BIN_CPE_ID_VENDOR = golang
+GO_BIN_CPE_ID_PRODUCT = go
 
 HOST_GO_BIN_PROVIDES = host-go
 
diff --git a/package/go/go-src/go-src.mk b/package/go/go-src/go-src.mk
index 340aada94c..c1f11a2262 100644
--- a/package/go/go-src/go-src.mk
+++ b/package/go/go-src/go-src.mk
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+GO_SRC_VERSION = $(GO_VERSION)
 GO_SRC_SITE = https://storage.googleapis.com/golang
 GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz
 GO_SRC_DL_SUBDIR = go
@@ -11,6 +12,7 @@ GO_SRC_DL_SUBDIR = go
 GO_SRC_LICENSE = BSD-3-Clause
 GO_SRC_LICENSE_FILES = LICENSE
 GO_SRC_CPE_ID_VENDOR = golang
+GO_SRC_CPE_ID_PRODUCT = go
 
 HOST_GO_SRC_PROVIDES = host-go
 HOST_GO_SRC_DEPENDENCIES = \