diff --git a/radio/fhi_72/CMakeLists.txt b/radio/fhi_72/CMakeLists.txt
index 0b78bf055b..c9addac423 100644
--- a/radio/fhi_72/CMakeLists.txt
+++ b/radio/fhi_72/CMakeLists.txt
@@ -16,13 +16,16 @@ add_library(oran_fhlib_5g MODULE
             oran-init.c
 )
 
+set(E_VERSION 5.1.5)
+set(F_VERSION 6.1.2)
+
 find_package(xran REQUIRED)
-if(xran_VERSION VERSION_EQUAL 5.1.5)
+if(xran_VERSION VERSION_EQUAL E_VERSION)
   target_compile_definitions(oran_fhlib_5g PRIVATE E_RELEASE)
-elseif(xran_VERSION VERSION_EQUAL 6.1.2)
+elseif(xran_VERSION VERSION_EQUAL F_VERSION)
   target_compile_definitions(oran_fhlib_5g PRIVATE F_RELEASE)
 else()
-  message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed 5.1.5 (E release) or 6.1.2 (F release)")
+  message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${E_VERSION} (E release) or ${F_VERSION} (F release)")
 endif()
 
 # Ignore xran-specific warning: we don't care/can't change the following warning, so suppress
diff --git a/radio/fhi_72/mplane/CMakeLists.txt b/radio/fhi_72/mplane/CMakeLists.txt
index a6bd7e62d7..65faa6dfbd 100644
--- a/radio/fhi_72/mplane/CMakeLists.txt
+++ b/radio/fhi_72/mplane/CMakeLists.txt
@@ -6,9 +6,9 @@ add_library(oran_fhlib_5g_mplane MODULE
 )
 add_dependencies(oran_fhlib_5g_mplane oran_fhlib_5g)
 
-if(xran_VERSION VERSION_EQUAL 5.1.4)
+if(xran_VERSION VERSION_EQUAL E_VERSION)
   target_compile_definitions(oran_fhlib_5g_mplane PRIVATE E_RELEASE)
-elseif(xran_VERSION VERSION_EQUAL 6.1.1)
+elseif(xran_VERSION VERSION_EQUAL F_VERSION)
   target_compile_definitions(oran_fhlib_5g_mplane PRIVATE F_RELEASE)
 endif()