diff --git a/COPYING b/COPYING
index 81d920943..2254cb05c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,7 @@
 # License 1
 
+SPDX-License-Identifier: BSD-3-Clause
+
 BSD 3-Clause License
 
 Copyright (c) 2024-present, Valkey contributors
diff --git a/deps/fast_float_c_interface/fast_float_strtod.cpp b/deps/fast_float_c_interface/fast_float_strtod.cpp
index 8e5d19470..e8c06696f 100644
--- a/deps/fast_float_c_interface/fast_float_strtod.cpp
+++ b/deps/fast_float_c_interface/fast_float_strtod.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "../fast_float/fast_float.h"
diff --git a/src/allocator_defrag.c b/src/allocator_defrag.c
index 5e805b304..b9dedb3b0 100644
--- a/src/allocator_defrag.c
+++ b/src/allocator_defrag.c
@@ -1,8 +1,8 @@
-/* Copyright 2024- Valkey contributors
+/*
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
 /*
  * This file implements allocator-specific defragmentation logic used
  * within the Valkey engine. Below is the relationship between various
diff --git a/src/asciilogo.h b/src/asciilogo.h
index d05466ba5..65df3a16f 100644
--- a/src/asciilogo.h
+++ b/src/asciilogo.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2009-2012, Redis Ltd.
- * Copyright (c) 2024, Valkey contributors
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 const char *ascii_logo =
     "                .+^+.                                                \n"
     "            .+#########+.                                            \n"
diff --git a/src/blocked.c b/src/blocked.c
index 1edb7728c..56482218e 100644
--- a/src/blocked.c
+++ b/src/blocked.c
@@ -26,9 +26,13 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * ---------------------------------------------------------------------------
- *
+ */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+/*
  * API:
  *
  * blockClient() set the CLIENT_BLOCKED flag in the client, and set the
diff --git a/src/cluster.c b/src/cluster.c
index 6ee514300..be95dbcd4 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -26,7 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 /*
  * cluster.c contains the common parts of a clustering
  * implementation, the parts that are shared between
diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
index dba3619f5..b57b5e0d2 100644
--- a/src/cluster_legacy.c
+++ b/src/cluster_legacy.c
@@ -26,7 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 /*
  * cluster_legacy.c contains the implementation of the cluster API that is
  * specific to the standard, cluster-bus based clustering mechanism.
diff --git a/src/cluster_slot_stats.c b/src/cluster_slot_stats.c
index b52692bd1..4cfb5b935 100644
--- a/src/cluster_slot_stats.c
+++ b/src/cluster_slot_stats.c
@@ -1,9 +1,8 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  */
-
 #include "cluster_slot_stats.h"
 
 #define UNASSIGNED_SLOT 0
diff --git a/src/commandlog.c b/src/commandlog.c
index cf25cbf2c..58f3f9f2b 100644
--- a/src/commandlog.c
+++ b/src/commandlog.c
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 /* Commandlog implements a system that is able to remember the latest N
  * queries that took more than M microseconds to execute, or consumed
  * too much network bandwidth and memory for input/output buffers.
@@ -14,10 +20,6 @@
  * but is accessible thanks to the COMMANDLOG command.
  *
  * ----------------------------------------------------------------------------
- *
- * Copyright Valkey Contributors.
- * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
  */
 
 #include "commandlog.h"
diff --git a/src/defrag.c b/src/defrag.c
index da8ec1e95..a7f86f3b6 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -32,6 +32,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include "hashtable.h"
diff --git a/src/dict.c b/src/dict.c
index f75369d53..9da39967b 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -32,7 +32,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 #include "fmacros.h"
 
 #include <stddef.h>
diff --git a/src/eval.c b/src/eval.c
index 13673a0ab..2454edfc7 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 /*
  * This file initializes the global LUA object and registers functions to call Valkey API from within the LUA language.
diff --git a/src/expire.c b/src/expire.c
index e4c3b0ec9..ec59e8989 100644
--- a/src/expire.c
+++ b/src/expire.c
@@ -29,6 +29,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 
diff --git a/src/functions.c b/src/functions.c
index 3da7f4b87..d8cf35da8 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "functions.h"
 #include "sds.h"
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
index 6056bc009..8bd3b4cc7 100644
--- a/src/hyperloglog.c
+++ b/src/hyperloglog.c
@@ -28,6 +28,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include "intrinsics.h"
diff --git a/src/io_threads.c b/src/io_threads.c
index 4d7fae3b9..f1df1e85a 100644
--- a/src/io_threads.c
+++ b/src/io_threads.c
@@ -1,7 +1,7 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "io_threads.h"
diff --git a/src/lua/engine_lua.c b/src/lua/engine_lua.c
index 295ca78ed..9cfbbe80c 100644
--- a/src/lua/engine_lua.c
+++ b/src/lua/engine_lua.c
@@ -1,5 +1,5 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
diff --git a/src/memory_prefetch.c b/src/memory_prefetch.c
index ef6a6c6d0..21e326b8d 100644
--- a/src/memory_prefetch.c
+++ b/src/memory_prefetch.c
@@ -1,8 +1,9 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
- *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+/*
  * This file utilizes prefetching keys and data for multiple commands in a batch,
  * to improve performance by amortizing memory access costs across multiple operations.
  */
diff --git a/src/module.c b/src/module.c
index d87e339c2..2da40e8dd 100644
--- a/src/module.c
+++ b/src/module.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 /* --------------------------------------------------------------------------
  * Modules API documentation information
diff --git a/src/rdb.c b/src/rdb.c
index 4a62883ed..c0d8cd9da 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include "lzf.h" /* LZF compression library */
diff --git a/src/rdma.c b/src/rdma.c
index 406a037a9..1e3bdc525 100644
--- a/src/rdma.c
+++ b/src/rdma.c
@@ -7,6 +7,11 @@
  * the top-level directory.
  * ==========================================================================
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #define VALKEYMODULE_CORE_MODULE
 #include "server.h"
diff --git a/src/replication.c b/src/replication.c
index 4115b33a2..981e1f410 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -27,7 +27,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include "cluster.h"
diff --git a/src/scripting_engine.c b/src/scripting_engine.c
index 93e18cd4a..1a3c75c48 100644
--- a/src/scripting_engine.c
+++ b/src/scripting_engine.c
@@ -1,5 +1,5 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
diff --git a/src/server.c b/src/server.c
index 26e2aabb3..5affc8d8a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -26,7 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 #include "server.h"
 #include "monotonic.h"
 #include "cluster.h"
diff --git a/src/t_hash.c b/src/t_hash.c
index 547aea9e1..7ae1726b4 100644
--- a/src/t_hash.c
+++ b/src/t_hash.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include <math.h>
diff --git a/src/t_set.c b/src/t_set.c
index a69345de4..fe4904bcb 100644
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include "hashtable.h"
diff --git a/src/t_string.c b/src/t_string.c
index da8953ee0..3d4585545 100644
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -26,6 +26,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #include "server.h"
 #include <math.h> /* isnan(), isinf() */
diff --git a/src/t_zset.c b/src/t_zset.c
index 2444f3ecd..d73faa8b0 100644
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -27,7 +27,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 /*-----------------------------------------------------------------------------
  * Sorted set API
  *----------------------------------------------------------------------------*/
diff --git a/src/unit/test_main.c b/src/unit/test_main.c
index 1f72f4255..947425aa6 100644
--- a/src/unit/test_main.c
+++ b/src/unit/test_main.c
@@ -1,7 +1,7 @@
 /*
- * Copyright Valkey contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include <strings.h>
diff --git a/src/unit/test_valkey_strtod.c b/src/unit/test_valkey_strtod.c
index 4796d7a5b..dd07d51b4 100644
--- a/src/unit/test_valkey_strtod.c
+++ b/src/unit/test_valkey_strtod.c
@@ -1,10 +1,9 @@
 /*
- * Copyright Valkey Contributors.
+ * Copyright (c) Valkey Contributors
  * All rights reserved.
- * SPDX-License-Identifier: BSD 3-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
-
 #include "../valkey_strtod.h"
 #include "errno.h"
 #include "math.h"
diff --git a/src/valkey-cli.c b/src/valkey-cli.c
index a3778eefe..eb893a2ab 100644
--- a/src/valkey-cli.c
+++ b/src/valkey-cli.c
@@ -27,7 +27,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
+/*
+ * Copyright (c) Valkey Contributors
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 #include "fmacros.h"
 
 #include <stdio.h>