diff --git a/dht/token_range_endpoints.hh b/dht/token_range_endpoints.hh
index 1bdf3a5c9a..d4d1c18923 100644
--- a/dht/token_range_endpoints.hh
+++ b/dht/token_range_endpoints.hh
@@ -2,22 +2,8 @@
  * Copyright (C) 2015-present ScyllaDB.
  */
 
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General License for more details.
- *
- * You should have received a copy of the GNU General License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+// SPDX-License-Identifier: AGPL-3.0-or-later
 
 #pragma once
 #include <vector>
diff --git a/gen_segmented_compress_params.py b/gen_segmented_compress_params.py
index 3da43f7625..9ac41bca2d 100755
--- a/gen_segmented_compress_params.py
+++ b/gen_segmented_compress_params.py
@@ -116,22 +116,7 @@ file_str = """
  * Copyright (C) 2017-present ScyllaDB
  */
 
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: AGPL-3.0-or-later
 
 /*
  * This file was autogenerated by gen_segmented_compress_params.py.
diff --git a/idl-compiler.py b/idl-compiler.py
index 55398a8e63..64db083dd3 100755
--- a/idl-compiler.py
+++ b/idl-compiler.py
@@ -47,23 +47,7 @@ def print_cw(f):
  * Copyright 2016-present ScyllaDB
  */
 
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
+// SPDX-License-Identifier: AGPL-3.0-or-later
 
  /*
   * This is an auto-generated code, do not modify directly.
diff --git a/test/boost/aggregate_fcts_test.cc b/test/boost/aggregate_fcts_test.cc
index b84b41e9e9..f361ad2533 100644
--- a/test/boost/aggregate_fcts_test.cc
+++ b/test/boost/aggregate_fcts_test.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/boost/big_decimal_test.cc b/test/boost/big_decimal_test.cc
index f319207b23..3cc233db4b 100644
--- a/test/boost/big_decimal_test.cc
+++ b/test/boost/big_decimal_test.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/lib/simple_position_reader_queue.hh b/test/lib/simple_position_reader_queue.hh
index 0f97d974da..d3d89597fd 100644
--- a/test/lib/simple_position_reader_queue.hh
+++ b/test/lib/simple_position_reader_queue.hh
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_big_decimal.cc b/test/perf/perf_big_decimal.cc
index 26c14c9d70..d5822235b2 100644
--- a/test/perf/perf_big_decimal.cc
+++ b/test/perf/perf_big_decimal.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_checksum.cc b/test/perf/perf_checksum.cc
index dec8ad8db2..3497ee47cf 100644
--- a/test/perf/perf_checksum.cc
+++ b/test/perf/perf_checksum.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_idl.cc b/test/perf/perf_idl.cc
index 0c49112fdb..273c7f6ba9 100644
--- a/test/perf/perf_idl.cc
+++ b/test/perf/perf_idl.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_mutation_fragment.cc b/test/perf/perf_mutation_fragment.cc
index 8c99266a31..dd31c25f25 100644
--- a/test/perf/perf_mutation_fragment.cc
+++ b/test/perf/perf_mutation_fragment.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_mutation_readers.cc b/test/perf/perf_mutation_readers.cc
index de068131be..e320250340 100644
--- a/test/perf/perf_mutation_readers.cc
+++ b/test/perf/perf_mutation_readers.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/test/perf/perf_vint.cc b/test/perf/perf_vint.cc
index 438a9145ed..a2150b4e5b 100644
--- a/test/perf/perf_vint.cc
+++ b/test/perf/perf_vint.cc
@@ -3,8 +3,6 @@
  */
 
 /*
- * This file is part of Scylla.
- *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */