diff --git a/devstack/lib/stx-metal b/devstack/lib/stx-metal
index 10386dbb..b61b2484 100644
--- a/devstack/lib/stx-metal
+++ b/devstack/lib/stx-metal
@@ -72,6 +72,7 @@ function build_mtce {
         VER_MJR=${major} \
         VER=${major}.${minor} \
         CCFLAGS=' -g -O2 -Wall -Wextra -std=c++11 -DBUILDINFO="\"$$(date)\""' \
+        EXTRALDFLAGS="-L$STX_INST_DIR"/lib64 \
         build
 
     popd
diff --git a/mtce/src/alarm/Makefile b/mtce/src/alarm/Makefile
index a9492b5d..a27b0fb5 100755
--- a/mtce/src/alarm/Makefile
+++ b/mtce/src/alarm/Makefile
@@ -43,7 +43,7 @@ library:
 	 ar rcs libalarm.a alarm.o $(EXTRAARFLAGS)
 
 process: $(OBJS)
-	$(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) -o mtcalarmd
+	$(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd
 
 clean_bins:
 	@rm -v -f $(BINS)
diff --git a/mtce/src/fsmon/Makefile b/mtce/src/fsmon/Makefile
index a6e4f30a..b53cce0a 100644
--- a/mtce/src/fsmon/Makefile
+++ b/mtce/src/fsmon/Makefile
@@ -28,7 +28,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) -o fsmond
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond
 
 common:
 	( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
diff --git a/mtce/src/heartbeat/Makefile b/mtce/src/heartbeat/Makefile
index e36de539..a625f20b 100755
--- a/mtce/src/heartbeat/Makefile
+++ b/mtce/src/heartbeat/Makefile
@@ -33,15 +33,15 @@ endif
 all: static_analysis common agent client
 
 build: static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) -o hbsAgent
-	$(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) -o hbsClient
+	$(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
+	$(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient
 
 common:
 	( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
 
 agent: $(OBJS)
-	$(CXX) $(CCFLAGS) hbsAgent.o -L../alarm -L../public $(LDLIBS) -o hbsAgent
-	
+	$(CXX) $(CCFLAGS) hbsAgent.o -L../alarm -L../public $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
+
 client: $(OBJS)
 	$(CXX) $(CCFLAGS) hbsClient.o -L../public $(LDLIBS) -o hbsClient
 
diff --git a/mtce/src/hostw/Makefile b/mtce/src/hostw/Makefile
index 334403c0..d72708c3 100755
--- a/mtce/src/hostw/Makefile
+++ b/mtce/src/hostw/Makefile
@@ -28,7 +28,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) -o hostwd
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd
 
 common:
 	( cd ../common ; make clean ; make -j1 lib VER=$(VER) VER_MJR=$(VER_MJR))
diff --git a/mtce/src/hwmon/Makefile b/mtce/src/hwmon/Makefile
index 9d9c8c3c..6d7cee3d 100644
--- a/mtce/src/hwmon/Makefile
+++ b/mtce/src/hwmon/Makefile
@@ -23,7 +23,7 @@ SRCS += hwmonFsm.cpp
 
 OBJS = $(SRCS:.cpp=.o)
 BIN = hwmond
-LDLIBS = -lstdc++ -ldaemon -lfmcommon -lcommon -lthreadUtil -lipmiUtil -lpthread -levent -ljson-c -lrt -lcrypto 
+LDLIBS = -lstdc++ -ldaemon -lfmcommon -lcommon -lthreadUtil -lipmiUtil -lpthread -levent -ljson-c -lrt -lcrypto
 INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common
 INCLUDES += -I../maintenance
 CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11 -pthread
@@ -45,7 +45,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) -o $(BIN)
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN)
 
 common:
 	( cd ../common ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
@@ -57,4 +57,4 @@ clean_bins:
 	@rm -v -f $(BIN)
 
 clean:
-	@rm -v -f $(OBJS) $(BIN) 
+	@rm -v -f $(OBJS) $(BIN)
diff --git a/mtce/src/lmon/Makefile b/mtce/src/lmon/Makefile
index 2681097d..9e328a4b 100755
--- a/mtce/src/lmon/Makefile
+++ b/mtce/src/lmon/Makefile
@@ -29,7 +29,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) -o lmond
+	$(CXX) $(CCFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond
 
 clean:
 	@rm -v -f $(OBJ) lmond *.o *.a
diff --git a/mtce/src/maintenance/Makefile b/mtce/src/maintenance/Makefile
index d2a13484..c195dd57 100755
--- a/mtce/src/maintenance/Makefile
+++ b/mtce/src/maintenance/Makefile
@@ -77,10 +77,10 @@ common:
 	( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
 
 mtcAgent: $(OBJS)
-	$(CXX) $(CONTROL_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcAgent
+	$(CXX) $(CONTROL_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent
 
 mtcClient: $(OBJS)
-	$(CXX) $(COMPUTE_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcClient
+	$(CXX) $(COMPUTE_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient
 
 remove_bins:
 	@rm -v -f $(BINS)
diff --git a/mtce/src/mtclog/Makefile b/mtce/src/mtclog/Makefile
index 06744e2e..1d49aa40 100644
--- a/mtce/src/mtclog/Makefile
+++ b/mtce/src/mtclog/Makefile
@@ -30,7 +30,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) -o mtclogd 
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd
 
 common:
 	( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
diff --git a/mtce/src/pmon/Makefile b/mtce/src/pmon/Makefile
index 12ac4490..f75f2be9 100755
--- a/mtce/src/pmon/Makefile
+++ b/mtce/src/pmon/Makefile
@@ -29,7 +29,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) -o pmond
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond
 
 common:
 	( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
diff --git a/mtce/src/rmon/Makefile b/mtce/src/rmon/Makefile
index 0dbbe8ee..11efaac1 100755
--- a/mtce/src/rmon/Makefile
+++ b/mtce/src/rmon/Makefile
@@ -29,7 +29,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common -LrmonApi/ $(LDLIBS) -o rmond
+	$(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common -LrmonApi/ $(LDLIBS) $(EXTRALDFLAGS) -o rmond
 
 lib: build $(OBJS)
 
diff --git a/mtce/src/rmon/rmon_resource_notify/Makefile b/mtce/src/rmon/rmon_resource_notify/Makefile
index 011ccedd..726875b1 100644
--- a/mtce/src/rmon/rmon_resource_notify/Makefile
+++ b/mtce/src/rmon/rmon_resource_notify/Makefile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-SRCS = rmon_resource_notify.cpp 
+SRCS = rmon_resource_notify.cpp
 OBJS = $(SRCS:.cpp=.o)
 LDLIBS = -lstdc++ -lrmonapi -lrt
 INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common
@@ -13,7 +13,7 @@ CCFLAGS = -g -O2 -Wall -Wextra -Werror
 
 STATIC_ANALYSIS_TOOL = cppcheck
 STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0)
- 
+
 all: build
 
 .cpp.o:
@@ -27,7 +27,7 @@ else
 endif
 
 build: clean static_analysis $(OBJS)
-	$(CXX) $(CCFLAGS) $(OBJS) -L../../common -L../../daemon -L../rmonApi/ $(LDLIBS) -o rmon_resource_notify
+	$(CXX) $(CCFLAGS) $(OBJS) -L../../common -L../../daemon -L../rmonApi/ $(LDLIBS) $(EXTRALDFLAGS) -o rmon_resource_notify
 
-clean: 
+clean:
 	@rm -v -f $(OBJ) rmon_resource_notify *.o *.a