diff --git a/evdev.cpp b/evdev.cpp
index 3ec1cac..4c33a44 100644
--- a/evdev.cpp
+++ b/evdev.cpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #include "evdev.hpp"
 
 #include "xyz/openbmc_project/Common/error.hpp"
diff --git a/evdev.hpp b/evdev.hpp
index c60022b..cc3e358 100644
--- a/evdev.hpp
+++ b/evdev.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #pragma once
 #include "file.hpp"
 
diff --git a/file.hpp b/file.hpp
index bc970bf..3ee65d4 100644
--- a/file.hpp
+++ b/file.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #pragma once
 
 #include <unistd.h>
diff --git a/gpioMon.cpp b/gpioMon.cpp
index 20805cd..deebebe 100644
--- a/gpioMon.cpp
+++ b/gpioMon.cpp
@@ -1,18 +1,5 @@
-/**
- * Copyright © 2019 Facebook
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 
 #include "gpioMon.hpp"
 
diff --git a/gpioMon.hpp b/gpioMon.hpp
index 2add08c..2d68891 100644
--- a/gpioMon.hpp
+++ b/gpioMon.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #pragma once
 
 #include <gpiod.h>
diff --git a/gpioMonMain.cpp b/gpioMonMain.cpp
index 03d50c9..e6ef782 100644
--- a/gpioMonMain.cpp
+++ b/gpioMonMain.cpp
@@ -1,18 +1,5 @@
-/**
- * Copyright © 2019 Facebook
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 
 #include "gpioMon.hpp"
 
diff --git a/mainapp.cpp b/mainapp.cpp
index 44a46c2..d65a393 100644
--- a/mainapp.cpp
+++ b/mainapp.cpp
@@ -1,18 +1,5 @@
-/**
- * Copyright © 2016 IBM Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright 2016 IBM Corporation
 
 #include "monitor.hpp"
 
diff --git a/monitor.cpp b/monitor.cpp
index cbc0c1c..ef6f115 100644
--- a/monitor.cpp
+++ b/monitor.cpp
@@ -1,18 +1,5 @@
-/**
- * Copyright © 2016 IBM Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright 2016 IBM Corporation
 
 #include "monitor.hpp"
 
diff --git a/monitor.hpp b/monitor.hpp
index 8efd68b..b27eedd 100644
--- a/monitor.hpp
+++ b/monitor.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright 2016 IBM Corporation
+
 #pragma once
 
 #include "evdev.hpp"
diff --git a/multi-presence/gpio_presence.cpp b/multi-presence/gpio_presence.cpp
index 809a342..661000b 100644
--- a/multi-presence/gpio_presence.cpp
+++ b/multi-presence/gpio_presence.cpp
@@ -1,19 +1,5 @@
-/**
- * Copyright © 2019 Facebook
- * Copyright © 2023 9elements GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 
 #include "gpio_presence.hpp"
 
diff --git a/multi-presence/gpio_presence.hpp b/multi-presence/gpio_presence.hpp
index c34ed75..19b6503 100644
--- a/multi-presence/gpio_presence.hpp
+++ b/multi-presence/gpio_presence.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #pragma once
 
 #include <gpiod.h>
diff --git a/multi-presence/main.cpp b/multi-presence/main.cpp
index b7fba2e..73c91b1 100644
--- a/multi-presence/main.cpp
+++ b/multi-presence/main.cpp
@@ -1,19 +1,5 @@
-/**
- * Copyright © 2019 Facebook
- * Copyright © 2023 9elements GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 
 #include "gpio_presence.hpp"
 
diff --git a/presence/gpio_presence.cpp b/presence/gpio_presence.cpp
index b009d3f..cce388f 100644
--- a/presence/gpio_presence.cpp
+++ b/presence/gpio_presence.cpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #include "gpio_presence.hpp"
 
 #include "xyz/openbmc_project/Common/error.hpp"
diff --git a/presence/gpio_presence.hpp b/presence/gpio_presence.hpp
index 52a1653..b37cc0c 100644
--- a/presence/gpio_presence.hpp
+++ b/presence/gpio_presence.hpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #pragma once
 #include "evdev.hpp"
 
diff --git a/presence/main.cpp b/presence/main.cpp
index 3e94b85..271f9a7 100644
--- a/presence/main.cpp
+++ b/presence/main.cpp
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
+
 #include "gpio_presence.hpp"
 
 #include <systemd/sd-event.h>
diff --git a/test/utest.cpp b/test/utest.cpp
index 8e0091e..93a4082 100644
--- a/test/utest.cpp
+++ b/test/utest.cpp
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright OpenBMC Authors
 #include "evdev.hpp"
 #include "monitor.hpp"