diff --git a/makefiles/release/include.mk b/makefiles/release/include.mk
index 3c9879e..8891df1 100644
--- a/makefiles/release/include.mk
+++ b/makefiles/release/include.mk
@@ -23,12 +23,12 @@
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##
-include $(MAKEDIR)/release/help.mk
-include $(MAKEDIR)/release/required.mk
+include $(ONF_MAKEDIR)/release/help.mk
+include $(ONF_MAKEDIR)/release/required.mk
 
 ifdef USE_VOLTHA_RELEASE_MK
   # Dynamic loading when targets are requested by name
-  include $(MAKEDIR)/release/targets.mk
+  include $(ONF_MAKEDIR)/release/targets.mk
 endif
 
 # [EOF]
diff --git a/makefiles/release/targets.mk b/makefiles/release/targets.mk
index ea2988a..b201998 100644
--- a/makefiles/release/targets.mk
+++ b/makefiles/release/targets.mk
@@ -32,10 +32,10 @@
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##
-include $(MAKEDIR)/release/voltha-versions.mk
-include $(MAKEDIR)/release/targets/voltha-certification.mk
-include $(MAKEDIR)/release/targets/voltha-e2e.mk
-include $(MAKEDIR)/release/targets/voltha-nightly-jobs.mk
+include $(ONF_MAKEDIR)/release/voltha-versions.mk
+include $(ONF_MAKEDIR)/release/targets/voltha-certification.mk
+include $(ONF_MAKEDIR)/release/targets/voltha-e2e.mk
+include $(ONF_MAKEDIR)/release/targets/voltha-nightly-jobs.mk
 
 # last-release  := voltha-2.11
 last-release := $(voltha-release-last)