diff --git a/meson.build b/meson.build
index 238a82c..d949d43 100644
--- a/meson.build
+++ b/meson.build
@@ -1,30 +1,34 @@
 project(
-     'vpd-manager',
-     'c',
-     'cpp',
-     default_options: [
-       'warning_level=3',
-       'werror=true',
-       'cpp_std=c++23',
-       'buildtype=debugoptimized'
-     ],
-     version: '1.0',
-     meson_version: '>=1.1.1',
+    'vpd-manager',
+    'c',
+    'cpp',
+    default_options: [
+        'warning_level=3',
+        'werror=true',
+        'cpp_std=c++23',
+        'buildtype=debugoptimized',
+    ],
+    version: '1.0',
+    meson_version: '>=1.1.1',
 )
 
-add_global_arguments('-Wno-psabi', '-Wno-ignored-attributes', language : ['c', 'cpp'])
+add_global_arguments(
+    '-Wno-psabi',
+    '-Wno-ignored-attributes',
+    language: ['c', 'cpp'],
+)
 
 # Disable FORTIFY_SOURCE when compiling with no optimization
-if(get_option('optimization') == '0')
-  add_project_arguments('-U_FORTIFY_SOURCE',language:['cpp','c'])
-  message('Disabling FORTIFY_SOURCE as optimization is set to 0')
+if (get_option('optimization') == '0')
+    add_project_arguments('-U_FORTIFY_SOURCE', language: ['cpp', 'c'])
+    message('Disabling FORTIFY_SOURCE as optimization is set to 0')
 endif
 
 # Setup googletest before we import any projects that also depend on it to make
 # sure we have control over its configuration
 build_tests = get_option('tests')
 
-sdbusplus = dependency('sdbusplus', fallback: [ 'sdbusplus', 'sdbusplus_dep' ])
+sdbusplus = dependency('sdbusplus', fallback: ['sdbusplus', 'sdbusplus_dep'])
 phosphor_logging = dependency('phosphor-logging')
 phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces')
 
@@ -39,14 +43,22 @@
 conf_data.set_quoted('OBJPATH', get_option('OBJPATH'))
 conf_data.set_quoted('IFACE', get_option('IFACE'))
 conf_data.set_quoted('BAD_VPD_DIR', get_option('BAD_VPD_DIR'))
-conf_data.set_quoted('INVENTORY_JSON_DEFAULT', get_option('INVENTORY_JSON_DEFAULT'))
-conf_data.set_quoted('INVENTORY_JSON_SYM_LINK', get_option('INVENTORY_JSON_SYM_LINK'))
-conf_data.set_quoted('JSON_ABSOLUTE_PATH_PREFIX', get_option('JSON_ABSOLUTE_PATH_PREFIX'))
+conf_data.set_quoted(
+    'INVENTORY_JSON_DEFAULT',
+    get_option('INVENTORY_JSON_DEFAULT'),
+)
+conf_data.set_quoted(
+    'INVENTORY_JSON_SYM_LINK',
+    get_option('INVENTORY_JSON_SYM_LINK'),
+)
+conf_data.set_quoted(
+    'JSON_ABSOLUTE_PATH_PREFIX',
+    get_option('JSON_ABSOLUTE_PATH_PREFIX'),
+)
 conf_data.set_quoted('SYSTEM_VPD_FILE_PATH', get_option('SYSTEM_VPD_FILE_PATH'))
 conf_data.set_quoted('VPD_SYMLIMK_PATH', get_option('VPD_SYMLIMK_PATH'))
 conf_data.set_quoted('PIM_PATH_PREFIX', get_option('PIM_PATH_PREFIX'))
-configure_file(output: 'config.h',
-            configuration : conf_data)
+configure_file(output: 'config.h', configuration: conf_data)
 
 services = ['service_files/vpd-manager.service']
 
@@ -54,36 +66,40 @@
     subdir('vpd-tool')
     scripts = ['scripts/wait-vpd-status.sh']
 
-    install_data(scripts,
+    install_data(
+        scripts,
         install_mode: 'rwxr-xr-x',
-        install_dir: get_option('bindir'))
+        install_dir: get_option('bindir'),
+    )
 
-    services += ['service_files/system-vpd.service',
-            'service_files/wait-vpd-parsers.service']
+    services += [
+        'service_files/system-vpd.service',
+        'service_files/wait-vpd-parsers.service',
+    ]
 
     package_datadir = join_paths('share', 'vpd')
-    install_subdir('configuration/ibm/', install_mode: 'rwxr-xr-x', install_dir: package_datadir, strip_directory: true)
+    install_subdir(
+        'configuration/ibm/',
+        install_mode: 'rwxr-xr-x',
+        install_dir: package_datadir,
+        strip_directory: true,
+    )
 endif
 
-libgpiodcxx = dependency(
-            'libgpiodcxx',
-            default_options: ['bindings=cxx'],
-        )
+libgpiodcxx = dependency('libgpiodcxx', default_options: ['bindings=cxx'])
 
-libvpdecc_src = files(
-        'vpdecc/vpdecc.c',
-        'vpdecc/vpdecc_support.c'
-    )
+libvpdecc_src = files('vpdecc/vpdecc.c', 'vpdecc/vpdecc_support.c')
 
-    libvpdecc = shared_library(
-        'vpdecc',
-        libvpdecc_src,
-        version: meson.project_version(),
-        install: true,
-    )
+libvpdecc = shared_library(
+    'vpdecc',
+    libvpdecc_src,
+    version: meson.project_version(),
+    install: true,
+)
 
 subdir('vpd-manager')
 
 systemd_system_unit_dir = dependency('systemd').get_variable(
-        'systemdsystemunitdir')
+    'systemdsystemunitdir',
+)
 install_data(services, install_dir: systemd_system_unit_dir)
diff --git a/test/meson.build b/test/meson.build
index 802dbe3..418c11d 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,32 +1,31 @@
 gtest_dep = dependency('gtest', main: true, disabler: true, required: false)
 gmock_dep = dependency('gmock', disabler: true, required: false)
-libgpiodcxx = dependency(
-            'libgpiodcxx',
-            default_options: ['bindings=cxx'],
-        )
+libgpiodcxx = dependency('libgpiodcxx', default_options: ['bindings=cxx'])
 if not gtest_dep.found() or not gmock_dep.found()
     cmake = import('cmake')
     gtest_opts = cmake.subproject_options()
     gtest_opts.set_override_option('warning_level', '1')
     gtest_opts.set_override_option('werror', 'false')
-    gtest_proj = cmake.subproject('googletest',
-                                  options: gtest_opts,
-                                  required: false)
+    gtest_proj = cmake.subproject(
+        'googletest',
+        options: gtest_opts,
+        required: false,
+    )
     if gtest_proj.found()
         gtest_dep = declare_dependency(
             dependencies: [
                 dependency('threads'),
                 gtest_proj.dependency('gtest'),
                 gtest_proj.dependency('gtest_main'),
-            ]
+            ],
         )
         gmock_dep = gtest_proj.dependency('gmock')
-  else
+    else
         assert(
             not get_option('tests').allowed(),
-            'Googletest is required if tests are enabled'
+            'Googletest is required if tests are enabled',
         )
-  endif
+    endif
 endif
 
 parser_build_arguments = []
@@ -36,35 +35,43 @@
 
 dependency_list = [gtest_dep, gmock_dep, sdbusplus, libgpiodcxx]
 
-configuration_inc = include_directories('..', '../vpd-manager/include', '../vpdecc')
+configuration_inc = include_directories(
+    '..',
+    '../vpd-manager/include',
+    '../vpdecc',
+)
 
 test_sources = [
-  '../vpd-manager/src/logger.cpp',
-  '../vpd-manager/src/ddimm_parser.cpp',
-  '../vpd-manager/src/parser.cpp',
-  '../vpd-manager/src/parser_factory.cpp',
-  '../vpd-manager/src/isdimm_parser.cpp',
-  '../vpd-manager/src/ipz_parser.cpp',
-  '../vpd-manager/src/keyword_vpd_parser.cpp',
-  '../vpd-manager/src/event_logger.cpp',
-  '../vpdecc/vpdecc.c'
+    '../vpd-manager/src/logger.cpp',
+    '../vpd-manager/src/ddimm_parser.cpp',
+    '../vpd-manager/src/parser.cpp',
+    '../vpd-manager/src/parser_factory.cpp',
+    '../vpd-manager/src/isdimm_parser.cpp',
+    '../vpd-manager/src/ipz_parser.cpp',
+    '../vpd-manager/src/keyword_vpd_parser.cpp',
+    '../vpd-manager/src/event_logger.cpp',
+    '../vpdecc/vpdecc.c',
 ]
 
 tests = [
-  'utest_utils.cpp',
-  'utest_keyword_parser.cpp',
-  'utest_ddimm_parser.cpp',
-  'utest_ipz_parser.cpp',
-  'utest_json_utility.cpp'
+    'utest_utils.cpp',
+    'utest_keyword_parser.cpp',
+    'utest_ddimm_parser.cpp',
+    'utest_ipz_parser.cpp',
+    'utest_json_utility.cpp',
 ]
 
 foreach test_file : tests
-  test(test_file, executable(test_file.underscorify(),
-                     test_file,
-                     test_sources,
-                     include_directories: configuration_inc,
-                     dependencies: dependency_list,
-                     cpp_args: parser_build_arguments
-                     ),
-       workdir: meson.current_source_dir())
+    test(
+        test_file,
+        executable(
+            test_file.underscorify(),
+            test_file,
+            test_sources,
+            include_directories: configuration_inc,
+            dependencies: dependency_list,
+            cpp_args: parser_build_arguments,
+        ),
+        workdir: meson.current_source_dir(),
+    )
 endforeach
diff --git a/vpd-manager/meson.build b/vpd-manager/meson.build
index 3a3710e..6c860da 100644
--- a/vpd-manager/meson.build
+++ b/vpd-manager/meson.build
@@ -1,21 +1,29 @@
-common_SOURCES = ['src/logger.cpp',
-                  'src/parser_factory.cpp',
-                  'src/ipz_parser.cpp',
-                  'src/keyword_vpd_parser.cpp',
-                  'src/ddimm_parser.cpp',
-                  'src/isdimm_parser.cpp',
-                  'src/parser.cpp',
-                  'src/worker.cpp',
-                  'src/backup_restore.cpp',
-                  'src/gpio_monitor.cpp',
-                  'src/event_logger.cpp']
+common_SOURCES = [
+    'src/logger.cpp',
+    'src/parser_factory.cpp',
+    'src/ipz_parser.cpp',
+    'src/keyword_vpd_parser.cpp',
+    'src/ddimm_parser.cpp',
+    'src/isdimm_parser.cpp',
+    'src/parser.cpp',
+    'src/worker.cpp',
+    'src/backup_restore.cpp',
+    'src/gpio_monitor.cpp',
+    'src/event_logger.cpp',
+]
 
-vpd_manager_SOURCES = ['src/manager_main.cpp',
-                    'src/manager.cpp',
-                    'src/bios_handler.cpp',
-                    ] + common_SOURCES
+vpd_manager_SOURCES = [
+    'src/manager_main.cpp',
+    'src/manager.cpp',
+    'src/bios_handler.cpp',
+] + common_SOURCES
 
-parser_dependencies = [sdbusplus, libgpiodcxx, phosphor_logging, phosphor_dbus_interfaces]
+parser_dependencies = [
+    sdbusplus,
+    libgpiodcxx,
+    phosphor_logging,
+    phosphor_dbus_interfaces,
+]
 
 parser_build_arguments = []
 if get_option('ibm_system').allowed()
@@ -23,25 +31,22 @@
 endif
 
 vpd_manager_exe = executable(
-                'vpd-manager',
-                vpd_manager_SOURCES,
-                include_directories : ['../', 'include/', '../configuration/'],
-                link_with : libvpdecc,
-                dependencies : [
-                                parser_dependencies,
-                                ],
-                install : true,
-                cpp_args : parser_build_arguments,
-                )
+    'vpd-manager',
+    vpd_manager_SOURCES,
+    include_directories: ['../', 'include/', '../configuration/'],
+    link_with: libvpdecc,
+    dependencies: [parser_dependencies],
+    install: true,
+    cpp_args: parser_build_arguments,
+)
 
-vpd_parser_SOURCES = ['src/vpd_parser_main.cpp',
-                     ]+ common_SOURCES
+vpd_parser_SOURCES = ['src/vpd_parser_main.cpp'] + common_SOURCES
 
 vpd_parser_exe = executable(
-                'vpd-parser',
-                vpd_parser_SOURCES,
-                include_directories : ['../', 'include/', '../configuration/'],
-                link_with : libvpdecc,
-                dependencies : parser_dependencies,
-                install : true,
-                )
\ No newline at end of file
+    'vpd-parser',
+    vpd_parser_SOURCES,
+    include_directories: ['../', 'include/', '../configuration/'],
+    link_with: libvpdecc,
+    dependencies: parser_dependencies,
+    install: true,
+)
diff --git a/vpd-tool/meson.build b/vpd-tool/meson.build
index a2c1ea1..95bf08b 100644
--- a/vpd-tool/meson.build
+++ b/vpd-tool/meson.build
@@ -5,15 +5,15 @@
     CLI11_dep = dependency('CLI11')
 endif
 
-sdbusplus = dependency('sdbusplus', fallback: [ 'sdbusplus', 'sdbusplus_dep' ])
+sdbusplus = dependency('sdbusplus', fallback: ['sdbusplus', 'sdbusplus_dep'])
 dependency_list = [CLI11_dep, sdbusplus]
 
-sources = ['src/vpd_tool_main.cpp',
-            'src/vpd_tool.cpp']
+sources = ['src/vpd_tool_main.cpp', 'src/vpd_tool.cpp']
 
-vpd_tool_exe = executable('vpd-tool',
-                          sources,
-                          include_directories : ['../', 'include/'],
-                          dependencies: dependency_list,
-                          install: true
-                        )
\ No newline at end of file
+vpd_tool_exe = executable(
+    'vpd-tool',
+    sources,
+    include_directories: ['../', 'include/'],
+    dependencies: dependency_list,
+    install: true,
+)