diff --git a/.gitmodules b/.gitmodules
index 0b23d6f..758cef6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "lf/onf-make"]
 	path = lf/onf-make
-	url = https://gerrit.opencord.org/onf-make
+	url = https://github.com/opencord/onf-make.git
diff --git a/Makefile b/Makefile
index 651ea0b..5829b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2017-2024 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2017-2024 Open Networking Foundation Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2017-2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+# Intent: This makefile will build, test & deploy tool bbsim
+# -----------------------------------------------------------------------
 
 $(if $(DEBUG),$(warning ENTER))
 
@@ -23,6 +28,18 @@
 ##-------------------##
 ##---]  GLOBALS  [---##
 ##-------------------##
+ifeq ($(USER),joey-disable) # temporary for transition
+
+##--------------------##
+##---]  INCLUDES  [---##
+##--------------------##
+include lf/include.mk
+include $(onf-mk-lib)/release/include.mk
+
+else
+##-------------------##
+##---]  GLOBALS  [---##
+##-------------------##
 TOP ?=$(strip \
   $(dir \
     $(abspath $(lastword $(MAKEFILE_LIST)))\
@@ -36,6 +53,8 @@
 include $(TOP)/makefiles/include.mk
 include $(ONF_MAKEDIR)/release/include.mk
 
+endif # USER==
+
 ##--------------------##
 ##---]  INCLUDES  [---##
 ##--------------------##