diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index f97df09..41e20d5 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,17 +1,6 @@
 #
-# Copyright (C) 2019 The Android Open-Source Project
-#
-# 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-FileCopyrightText: 2019 The Android Open-Source Project
+# SPDX-License-Identifier: Apache-2.0
 #
 
 PRODUCT_MAKEFILES := \
diff --git a/aosp_bluejay.mk b/aosp_bluejay.mk
index d9b8d0f..7de757e 100644
--- a/aosp_bluejay.mk
+++ b/aosp_bluejay.mk
@@ -1,17 +1,6 @@
 #
-# Copyright 2021 The Android Open-Source Project
-#
-# 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-FileCopyrightText: 2021 The Android Open-Source Project
+# SPDX-License-Identifier: Apache-2.0
 #
 
 $(call inherit-product, device/google/gs101/aosp_common.mk)
diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 6d2ddf8..ba7a2f0 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -1,17 +1,6 @@
 #
-# Copyright (C) 2020 The Android Open-Source Project
-#
-# 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-FileCopyrightText: 2020 The Android Open-Source Project
+# SPDX-License-Identifier: Apache-2.0
 #
 
 # Enable load module in parallel
diff --git a/device-bluejay.mk b/device-bluejay.mk
index bd67505..47c5731 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -1,17 +1,6 @@
 #
-# Copyright (C) 2021 The Android Open-Source Project
-#
-# 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-FileCopyrightText: 2021 The Android Open-Source Project
+# SPDX-License-Identifier: Apache-2.0
 #
 
 TARGET_LINUX_KERNEL_VERSION := 6.1
diff --git a/powerstats/bluejay/Android.bp b/powerstats/bluejay/Android.bp
index d2f7f9e..5606fce 100644
--- a/powerstats/bluejay/Android.bp
+++ b/powerstats/bluejay/Android.bp
@@ -1,16 +1,7 @@
-// Copyright (C) 2021 The Android Open Source Project
 //
-// 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
+// SPDX-FileCopyrightText: 2021 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
 //
-//      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.
 
 soong_namespace {
     imports: [