diff --git a/recipes-connectivity/local-digital-twins/local-digital-twins_git.bb b/recipes-connectivity/local-digital-twins/local-digital-twins_git.bb
index 8ab07e0..c45e297 100644
--- a/recipes-connectivity/local-digital-twins/local-digital-twins_git.bb
+++ b/recipes-connectivity/local-digital-twins/local-digital-twins_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/local-digital-twins;protocol=https;bra
            file://service.template \
            "
 
-SRCREV = "72956d7d9c74f90a2fdd30727a3dce8eddee9178"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -39,9 +39,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/local-digital-twins"
 RPROVIDES:${PN} += "kanto/local-digital-twins"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${LDT_BIN_DD}"
 
diff --git a/recipes-connectivity/suite-bootstrapping/suite-bootstrapping_git.bb b/recipes-connectivity/suite-bootstrapping/suite-bootstrapping_git.bb
index eef4e6e..e488121 100644
--- a/recipes-connectivity/suite-bootstrapping/suite-bootstrapping_git.bb
+++ b/recipes-connectivity/suite-bootstrapping/suite-bootstrapping_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/suite-bootstrapping;protocol=https;bra
            file://service.template \
            "
 
-SRCREV = "d2aaa0104c69088c7c84fbeb0b55c35e30c6448c"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -39,9 +39,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/suite-bootstrapping"
 RPROVIDES:${PN} += "kanto/suite-bootstrapping"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${SB_BIN_DD}"
   
diff --git a/recipes-connectivity/suite-connector/suite-connector_git.bb b/recipes-connectivity/suite-connector/suite-connector_git.bb
index f2bd8c1..613ff14 100644
--- a/recipes-connectivity/suite-connector/suite-connector_git.bb
+++ b/recipes-connectivity/suite-connector/suite-connector_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/suite-connector;protocol=https;branch=
            file://service.template \
            "
 
-SRCREV = "5909123155229abb93838f782d9867f814a043ee"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -40,9 +40,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/suite-connector"
 RPROVIDES:${PN} += "kanto/suite-connector"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${SC_BIN_DD}"
  
diff --git a/recipes-containers/container-management/container-management_git.bb b/recipes-containers/container-management/container-management_git.bb
index 55d7c56..5bad4bb 100644
--- a/recipes-containers/container-management/container-management_git.bb
+++ b/recipes-containers/container-management/container-management_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/container-management;protocol=https;br
            file://service.template \
            "
 
-SRCREV = "e7fb861984deba4b7e7ba526c04ff695b1367cdc"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -48,13 +48,6 @@ FILES:${PN} += "${CM_BIN_DD}/container-management ${CM_BIN_DD}/kanto-cm"
 # ensure all additional resources are properly packed in the resulting package if provided
 FILES:${PN} += "${CM_CFG_DD}/container-management/config.json"
 
-VERSION_PKG = "github.com/eclipse-kanto/container-management/containerm"
-BUILD_TIME = "${@time.strftime('%Y-%m-%dT%H:%M:%SZ',time.gmtime())}"
-BUILD_VERSION = "0.1.0-M4"
-BUILD_REVISION = "${@'${SRCREV}'[:7]}"
-
-export GO_EXTRA_LDFLAGS="-X ${VERSION_PKG}/version.GitCommit=${BUILD_REVISION} -X ${VERSION_PKG}/version.ProjectVersion=${BUILD_VERSION} -X ${VERSION_PKG}/version.APIVersion=${BUILD_VERSION} -X ${VERSION_PKG}/version.BuildTime=${BUILD_TIME}"
-
 do_install() {
   install -d ${D}/${CM_BIN_DD}
 
diff --git a/recipes-management/file-backup/file-backup_git.bb b/recipes-management/file-backup/file-backup_git.bb
index b5f76cf..fd21f2c 100644
--- a/recipes-management/file-backup/file-backup_git.bb
+++ b/recipes-management/file-backup/file-backup_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/file-backup;protocol=https;branch=main
            file://service.template \
            "
 
-SRCREV = "ca98d480fbc4ca59d9945a42baeb8797c275c0b6"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -37,9 +37,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/file-backup"
 RPROVIDES:${PN} += "kanto/file-backup"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${FB_BIN_DD}"
 
diff --git a/recipes-management/file-upload/file-upload_git.bb b/recipes-management/file-upload/file-upload_git.bb
index 1fa428a..5da6ad2 100644
--- a/recipes-management/file-upload/file-upload_git.bb
+++ b/recipes-management/file-upload/file-upload_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/file-upload;protocol=https;branch=main
            file://service.template \
            "
 
-SRCREV = "9d94211b07f6c2825ca9b26ffce0015fae785b16"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -37,9 +37,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/file-upload"
 RPROVIDES:${PN} += "kanto/file-upload"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${FU_BIN_DD}"
 
diff --git a/recipes-management/software-update/software-update_git.bb b/recipes-management/software-update/software-update_git.bb
index 208b48f..cf00eab 100644
--- a/recipes-management/software-update/software-update_git.bb
+++ b/recipes-management/software-update/software-update_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/software-update;protocol=https;branch=
            file://service.template \
            "
 
-SRCREV = "e59382a29230e58ff773c7ecc50a04c084542535"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -37,9 +37,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/software-update"
 RPROVIDES:${PN} += "kanto/software-update"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${SU_BIN_DD}"
 
diff --git a/recipes-management/update-manager/update-manager_git.bb b/recipes-management/update-manager/update-manager_git.bb
index a78ca65..a346df5 100644
--- a/recipes-management/update-manager/update-manager_git.bb
+++ b/recipes-management/update-manager/update-manager_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/update-manager;protocol=https;branch=m
            file://service.template \
            "
 
-SRCREV = "c8d40ac1c11e9e713851abe506c1b5a515bfb589"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -37,9 +37,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/update-manager"
 RPROVIDES:${PN} += "kanto/update-manager"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${UM_BIN_DD}"
 
diff --git a/recipes-monitoring/system-metrics/system-metrics_git.bb b/recipes-monitoring/system-metrics/system-metrics_git.bb
index 6c086b7..f36974a 100644
--- a/recipes-monitoring/system-metrics/system-metrics_git.bb
+++ b/recipes-monitoring/system-metrics/system-metrics_git.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/eclipse-kanto/system-metrics;protocol=https;branch=m
            file://service.template \
            "
 
-SRCREV = "f9811a0c55c5c3a5c2c35d2c075657942a7af21f"
+SRCREV = "${AUTOREV}"
 
 PV = "0.1.0-git${SRCPV}"
 
@@ -38,9 +38,6 @@ RDEPENDS:${PN} += "mosquitto"
 PROVIDES:${PN} += "kanto/system-metrics"
 RPROVIDES:${PN} += "kanto/system-metrics"
 
-BUILD_VERSION = "0.1.0-M4"
-export GO_EXTRA_LDFLAGS="-X main.version=${BUILD_VERSION}"
-
 do_install() {
   install -d "${D}/${SM_BIN_DD}"