diff --git a/bmc/Makefile.am b/bmc/Makefile.am
index 3bccc41..9398e90 100644
--- a/bmc/Makefile.am
+++ b/bmc/Makefile.am
@@ -12,11 +12,11 @@
 libbmc_common_la_CXXFLAGS = \
 	-I$(top_srcdir) \
 	$(SDBUSPLUS_CFLAGS) \
-        $(PHOSPHOR_LOGGING_CFLAGS) \
-        $(CODE_COVERAGE_CXXFLAGS) \
-        -flto
+	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	-flto
 libbmc_common_la_LDFLAGS = \
-        $(SDBUSPLUS_LIBS) \
-        $(PHOSPHOR_LOGGING_LIBS) \
-        $(CODE_COVERAGE_LIBS) \
-        -lstdc++fs
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS) \
+	$(CODE_COVERAGE_LIBS) \
+	-lstdc++fs
diff --git a/bmc/firmware-handler/Makefile.am b/bmc/firmware-handler/Makefile.am
index e7b8eb2..f4d8e43 100644
--- a/bmc/firmware-handler/Makefile.am
+++ b/bmc/firmware-handler/Makefile.am
@@ -74,14 +74,14 @@
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/bmc \
 	$(SDBUSPLUS_CFLAGS) \
-        $(PHOSPHOR_LOGGING_CFLAGS) \
-        $(CODE_COVERAGE_CXXFLAGS) \
-        -flto
+	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	-flto
 libfirmwareblob_common_la_LDFLAGS = \
-        $(SDBUSPLUS_LIBS) \
-        $(PHOSPHOR_LOGGING_LIBS) \
-        $(CODE_COVERAGE_LIBS) \
-        -lstdc++fs
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS) \
+	$(CODE_COVERAGE_LIBS) \
+	-lstdc++fs
 libfirmwareblob_common_la_LIBADD = $(top_builddir)/libfirmware_common.la
 libfirmwareblob_common_la_LIBADD += $(top_builddir)/bmc/libbmc_common.la
 
diff --git a/bmc/version-handler/Makefile.am b/bmc/version-handler/Makefile.am
index 5f94379..7230193 100644
--- a/bmc/version-handler/Makefile.am
+++ b/bmc/version-handler/Makefile.am
@@ -12,14 +12,14 @@
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/bmc \
 	$(SDBUSPLUS_CFLAGS) \
-        $(PHOSPHOR_LOGGING_CFLAGS) \
-        $(CODE_COVERAGE_CXXFLAGS) \
-        -flto
+	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	-flto
 libversionblob_common_la_LDFLAGS = \
-        $(SDBUSPLUS_LIBS) \
-        $(PHOSPHOR_LOGGING_LIBS) \
-        $(CODE_COVERAGE_LIBS) \
-        -lstdc++fs
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS) \
+	$(CODE_COVERAGE_LIBS) \
+	-lstdc++fs
 libversionblob_common_la_LIBADD = $(top_builddir)/libfirmware_common.la
 libversionblob_common_la_LIBADD += $(top_builddir)/bmc/libbmc_common.la