diff --git a/common/Makefile.am b/common/Makefile.am
index c9dfc667..a0b0a51a 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -81,6 +81,6 @@ common_swssloglevel_SOURCES =  \
 	common/loglevel_util.cpp
 
 
-common_swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -fstack-protector-strong
-common_swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS) -fstack-protector-strong
+common_swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
+common_swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS)
 common_swssloglevel_LDADD = common/libswsscommon.la $(CODE_COVERAGE_LIBS) -z now
diff --git a/configure.ac b/configure.ac
index 1d8c53b1..c3c660da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ CFLAGS_COMMON+=" -Wpacked"
 CFLAGS_COMMON+=" -Wpointer-arith"
 CFLAGS_COMMON+=" -Wredundant-decls"
 CFLAGS_COMMON+=" -Wshadow"
-CFLAGS_COMMON+=" -Wstack-protector"
+CFLAGS_COMMON+=" -Wstack-protector-strong"
 CFLAGS_COMMON+=" -Wstrict-aliasing=3"
 CFLAGS_COMMON+=" -Wswitch"
 CFLAGS_COMMON+=" -Wswitch-default"
diff --git a/sonic-db-cli/Makefile.am b/sonic-db-cli/Makefile.am
index 9b4a321f..7a20ec02 100755
--- a/sonic-db-cli/Makefile.am
+++ b/sonic-db-cli/Makefile.am
@@ -6,6 +6,6 @@ sonic_db_cli_libsonicdbcli_la_LIBADD = common/libswsscommon.la -lpthread
 
 bin_PROGRAMS += sonic-db-cli/sonic-db-cli
 sonic_db_cli_sonic_db_cli_SOURCES = sonic-db-cli/sonic-db-cli.cpp sonic-db-cli/main.cpp
-sonic_db_cli_sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) -fstack-protector-strong
-sonic_db_cli_sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -fstack-protector-strong
+sonic_db_cli_sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
+sonic_db_cli_sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
 sonic_db_cli_sonic_db_cli_LDADD = common/libswsscommon.la -lpthread -z now