diff --git a/recipes-core/os-release/os-release.bbappend b/recipes-core/os-release/os-release.bbappend
index c010146..0f938c3 100644
--- a/recipes-core/os-release/os-release.bbappend
+++ b/recipes-core/os-release/os-release.bbappend
@@ -13,22 +13,11 @@
     except:
         pass
 
-python() {
-    version_id = run_git(d, 'describe --dirty --long')
-    if version_id:
-        d.setVar('VERSION_ID', version_id)
-        versionList = version_id.split('-')
-        version = versionList[0] + "-" + versionList[1]
-        d.setVar('VERSION', version)
+VERSION_ID := "${@run_git(d, 'describe --dirty --long')}"
+VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}"
 
-    build_id = run_git(d, 'describe --abbrev=0')
-    if build_id:
-        d.setVar('BUILD_ID', build_id)
-
-    target_machine = d.getVar('MACHINE', True)
-    if target_machine:
-        d.setVar('OPENBMC_TARGET_MACHINE', target_machine)
-}
+BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}"
+OPENBMC_TARGET_MACHINE = "${MACHINE}"
 
 OS_RELEASE_FIELDS_append = " BUILD_ID OPENBMC_TARGET_MACHINE"