diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35a2de1..6da8ed8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
-# Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 cmake_minimum_required(VERSION 3.20)
 
diff --git a/chan.c b/chan.c
index b7c05d6..a3d1cc8 100644
--- a/chan.c
+++ b/chan.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "chan.h"
 
diff --git a/chan.h b/chan.h
index 2fdfd0d..34c848a 100644
--- a/chan.h
+++ b/chan.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_CHAN_H
 #define OVNI_CHAN_H
diff --git a/common.h b/common.h
index 42c14f1..6ca66fd 100644
--- a/common.h
+++ b/common.h
@@ -1,3 +1,6 @@
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: MIT */
+
 #ifndef COMMON_H
 #define COMMON_H
 
diff --git a/compat.h b/compat.h
index c0f4716..d669006 100644
--- a/compat.h
+++ b/compat.h
@@ -1,26 +1,5 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: MIT */
 
 #ifndef COMPAT_H
 #define COMPAT_H
diff --git a/dump.c b/dump.c
index 697c078..7b57d86 100644
--- a/dump.c
+++ b/dump.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _GNU_SOURCE
 
diff --git a/emu.c b/emu.c
index 8563dd2..3cbd675 100644
--- a/emu.c
+++ b/emu.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _POSIX_C_SOURCE 200112L
 
diff --git a/emu.h b/emu.h
index 757e212..045584d 100644
--- a/emu.h
+++ b/emu.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_EMU_H
 #define OVNI_EMU_H
diff --git a/emu_kernel.c b/emu_kernel.c
index 79caef6..199b0ee 100644
--- a/emu_kernel.c
+++ b/emu_kernel.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 
diff --git a/emu_nanos6.c b/emu_nanos6.c
index b2d0788..85557bf 100644
--- a/emu_nanos6.c
+++ b/emu_nanos6.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 #include "utlist.h"
diff --git a/emu_nodes.c b/emu_nodes.c
index 6289dcd..21184a1 100644
--- a/emu_nodes.c
+++ b/emu_nodes.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 
diff --git a/emu_nosv.c b/emu_nosv.c
index e1b9306..d70c182 100644
--- a/emu_nosv.c
+++ b/emu_nosv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 #include "utlist.h"
diff --git a/emu_openmp.c b/emu_openmp.c
index 6780d02..043b3eb 100644
--- a/emu_openmp.c
+++ b/emu_openmp.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 
diff --git a/emu_ovni.c b/emu_ovni.c
index 649af22..353af88 100644
--- a/emu_ovni.c
+++ b/emu_ovni.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "ovni.h"
 #include "emu.h"
diff --git a/emu_tampi.c b/emu_tampi.c
index 525f4e1..bd93e6e 100644
--- a/emu_tampi.c
+++ b/emu_tampi.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 
diff --git a/emu_task.c b/emu_task.c
index 67f5b10..926fa9f 100644
--- a/emu_task.c
+++ b/emu_task.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "uthash.h"
 #include "utlist.h"
diff --git a/emu_task.h b/emu_task.h
index 727aa9d..ab69025 100644
--- a/emu_task.h
+++ b/emu_task.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_EMU_TASK_H
 #define OVNI_EMU_TASK_H
diff --git a/heap.h b/heap.h
index 24fd191..a8c621f 100644
--- a/heap.h
+++ b/heap.h
@@ -2,20 +2,7 @@
  * heap.h - basic heap with intrusive structures.
  * Copyright (C) 2021 Barcelona Supercomputing Center (BSC)
  * Author: David Alvarez
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef HEAP_H
 #define HEAP_H
diff --git a/ovni.c b/ovni.c
index 2cacf06..b6a7fb1 100644
--- a/ovni.c
+++ b/ovni.c
@@ -1,26 +1,5 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: MIT */
 
 #define _GNU_SOURCE
 
diff --git a/ovni.h b/ovni.h
index df9a7fb..c28da86 100644
--- a/ovni.h
+++ b/ovni.h
@@ -1,26 +1,5 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: MIT */
 
 #ifndef OVNI_H
 #define OVNI_H
diff --git a/ovni2prv.c b/ovni2prv.c
index cee5fc2..bfa044f 100644
--- a/ovni2prv.c
+++ b/ovni2prv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/ovnisync.c b/ovnisync.c
index 01bf30c..a45a2ab 100644
--- a/ovnisync.c
+++ b/ovnisync.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _POSIX_C_SOURCE 200112L
 
diff --git a/pcf.c b/pcf.c
index ba2e855..c9dae9c 100644
--- a/pcf.c
+++ b/pcf.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "pcf.h"
 #include "prv.h"
diff --git a/pcf.h b/pcf.h
index 945a12d..4361c2b 100644
--- a/pcf.h
+++ b/pcf.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_PCF_H
 #define OVNI_PCF_H
diff --git a/prv.c b/prv.c
index 330895d..51afbe6 100644
--- a/prv.c
+++ b/prv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include <stdio.h>
 
diff --git a/prv.h b/prv.h
index de244b5..b420eb8 100644
--- a/prv.h
+++ b/prv.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_PRV_H
 #define OVNI_PRV_H
diff --git a/sort.c b/sort.c
index d959875..605115c 100644
--- a/sort.c
+++ b/sort.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 /* This program is a really bad idea. It attempts to sort streams by using a
  * window of the last N events in memory, so we can quickly access the event
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d8e181e..e19df6d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 set(OVNI_TEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}/test")
 set(OVNI_TEST_BUILD_DIR "${CMAKE_BINARY_DIR}/test")
diff --git a/test/emu/CMakeLists.txt b/test/emu/CMakeLists.txt
index e6930bb..cdc3cc4 100644
--- a/test/emu/CMakeLists.txt
+++ b/test/emu/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 add_subdirectory(ovni)
 add_subdirectory(nosv)
diff --git a/test/emu/instr.h b/test/emu/instr.h
index ea4bb75..3b22e98 100644
--- a/test/emu/instr.h
+++ b/test/emu/instr.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef INSTR_H
 #define INSTR_H
diff --git a/test/emu/nanos6/CMakeLists.txt b/test/emu/nanos6/CMakeLists.txt
index d74acbf..062ed14 100644
--- a/test/emu/nanos6/CMakeLists.txt
+++ b/test/emu/nanos6/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ovni_test(nested-tasks.c)
 ovni_test(nested-tasks-bad.c SHOULD_FAIL
diff --git a/test/emu/nanos6/blocking.c b/test/emu/nanos6/blocking.c
index 1747f5a..d01598b 100644
--- a/test/emu/nanos6/blocking.c
+++ b/test/emu/nanos6/blocking.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nanos6.h"
 
diff --git a/test/emu/nanos6/instr_nanos6.h b/test/emu/nanos6/instr_nanos6.h
index 2e8d937..9c09b81 100644
--- a/test/emu/nanos6/instr_nanos6.h
+++ b/test/emu/nanos6/instr_nanos6.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef INSTR_NANOS6_H
 #define INSTR_NANOS6_H
diff --git a/test/emu/nanos6/nested-tasks-bad.c b/test/emu/nanos6/nested-tasks-bad.c
index b16f98c..5956b13 100644
--- a/test/emu/nanos6/nested-tasks-bad.c
+++ b/test/emu/nanos6/nested-tasks-bad.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nanos6.h"
 
diff --git a/test/emu/nanos6/nested-tasks.c b/test/emu/nanos6/nested-tasks.c
index 48503de..020254b 100644
--- a/test/emu/nanos6/nested-tasks.c
+++ b/test/emu/nanos6/nested-tasks.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nanos6.h"
 
diff --git a/test/emu/nanos6/ss-mismatch.c b/test/emu/nanos6/ss-mismatch.c
index 72da8b3..b6229b3 100644
--- a/test/emu/nanos6/ss-mismatch.c
+++ b/test/emu/nanos6/ss-mismatch.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nanos6.h"
 
diff --git a/test/emu/nanos6/task-types.c b/test/emu/nanos6/task-types.c
index 3c7ba95..319e1aa 100644
--- a/test/emu/nanos6/task-types.c
+++ b/test/emu/nanos6/task-types.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nanos6.h"
 
diff --git a/test/emu/nosv/CMakeLists.txt b/test/emu/nosv/CMakeLists.txt
index 930b59a..ba0030d 100644
--- a/test/emu/nosv/CMakeLists.txt
+++ b/test/emu/nosv/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ovni_test(nested-tasks.c)
 ovni_test(nested-tasks-bad.c SHOULD_FAIL
diff --git a/test/emu/nosv/instr_nosv.h b/test/emu/nosv/instr_nosv.h
index 4050de2..48e90f5 100644
--- a/test/emu/nosv/instr_nosv.h
+++ b/test/emu/nosv/instr_nosv.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef INSTR_NOSV_H
 #define INSTR_NOSV_H
diff --git a/test/emu/nosv/nested-tasks-bad.c b/test/emu/nosv/nested-tasks-bad.c
index ba95b58..7618ca7 100644
--- a/test/emu/nosv/nested-tasks-bad.c
+++ b/test/emu/nosv/nested-tasks-bad.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nosv.h"
 
diff --git a/test/emu/nosv/nested-tasks.c b/test/emu/nosv/nested-tasks.c
index 8927839..3624c10 100644
--- a/test/emu/nosv/nested-tasks.c
+++ b/test/emu/nosv/nested-tasks.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nosv.h"
 
diff --git a/test/emu/nosv/pause.c b/test/emu/nosv/pause.c
index 70dd730..95ee1d1 100644
--- a/test/emu/nosv/pause.c
+++ b/test/emu/nosv/pause.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nosv.h"
 
diff --git a/test/emu/nosv/task-types.c b/test/emu/nosv/task-types.c
index 1ca7165..31b7476 100644
--- a/test/emu/nosv/task-types.c
+++ b/test/emu/nosv/task-types.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "instr_nosv.h"
 
diff --git a/test/emu/ovni/CMakeLists.txt b/test/emu/ovni/CMakeLists.txt
index d819064..51945ba 100644
--- a/test/emu/ovni/CMakeLists.txt
+++ b/test/emu/ovni/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later 
 
 # Only run performance sensitive tests on Release builds
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/test/emu/ovni/flush-overhead.c b/test/emu/ovni/flush-overhead.c
index f49905d..b040124 100644
--- a/test/emu/ovni/flush-overhead.c
+++ b/test/emu/ovni/flush-overhead.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _POSIX_C_SOURCE 200112L
 #define _GNU_SOURCE
diff --git a/test/emu/ovni/flush.c b/test/emu/ovni/flush.c
index 29a7c1a..6f46d0e 100644
--- a/test/emu/ovni/flush.c
+++ b/test/emu/ovni/flush.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _POSIX_C_SOURCE 200112L
 #define _GNU_SOURCE
diff --git a/test/emu/ovni/instr_ovni.h b/test/emu/ovni/instr_ovni.h
index 6a8d1cb..ab5bd29 100644
--- a/test/emu/ovni/instr_ovni.h
+++ b/test/emu/ovni/instr_ovni.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef INSTR_OVNI_H
 #define INSTR_OVNI_H
diff --git a/test/emu/ovni/mp-rank.c b/test/emu/ovni/mp-rank.c
index 443c45c..fa2f619 100644
--- a/test/emu/ovni/mp-rank.c
+++ b/test/emu/ovni/mp-rank.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _GNU_SOURCE
 
diff --git a/test/emu/ovni/mp-simple.c b/test/emu/ovni/mp-simple.c
index ac962e6..44d690e 100644
--- a/test/emu/ovni/mp-simple.c
+++ b/test/emu/ovni/mp-simple.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #define _GNU_SOURCE
 
diff --git a/test/macros.cmake b/test/macros.cmake
index 486a150..6469b88 100644
--- a/test/macros.cmake
+++ b/test/macros.cmake
@@ -1,3 +1,6 @@
+# Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 include(CMakeParseArguments)
 
 function(ovni_test source)
diff --git a/test/match-error.sh b/test/match-error.sh
index 1ffe563..fc0b5ca 100755
--- a/test/match-error.sh
+++ b/test/match-error.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # This script return 0 if and only if the given program returns non-zero
 # AND the regex matches the output
diff --git a/test/ovni-driver.sh b/test/ovni-driver.sh
index eff17b8..0e90554 100755
--- a/test/ovni-driver.sh
+++ b/test/ovni-driver.sh
@@ -1,19 +1,6 @@
 #!/bin/sh
-#
 # Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e
 
diff --git a/test/rt/CMakeLists.txt b/test/rt/CMakeLists.txt
index 256cad7..1274cf3 100644
--- a/test/rt/CMakeLists.txt
+++ b/test/rt/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
 # Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 add_subdirectory(nosv)
 add_subdirectory(nanos6)
diff --git a/test/rt/nanos6/CMakeLists.txt b/test/rt/nanos6/CMakeLists.txt
index fc5cf71..35ea67c 100644
--- a/test/rt/nanos6/CMakeLists.txt
+++ b/test/rt/nanos6/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 find_library(nanos6 libnanos6)
 find_path(NANOS6_INCLUDE_DIR nanos6.h)
 
diff --git a/test/rt/nanos6/external-thread.c b/test/rt/nanos6/external-thread.c
index f3256b0..c4541fa 100644
--- a/test/rt/nanos6/external-thread.c
+++ b/test/rt/nanos6/external-thread.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 /* Create a test which unblocks a task from an external thread. This
  * should break currently, as the instrumentation attempts to call
  * ovni_ev_emit from a thread without initialization. */
diff --git a/test/rt/nanos6/if0.c b/test/rt/nanos6/if0.c
index 9676eb4..fff4bc8 100644
--- a/test/rt/nanos6/if0.c
+++ b/test/rt/nanos6/if0.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 #define _GNU_SOURCE
 #include <unistd.h>
 
diff --git a/test/rt/nanos6/nanos6.toml b/test/rt/nanos6/nanos6.toml
index d604a39..1f7756b 100644
--- a/test/rt/nanos6/nanos6.toml
+++ b/test/rt/nanos6/nanos6.toml
@@ -1,11 +1,3 @@
-# This file is part of Nanos6 and is licensed under the terms contained in the COPYING file
-#
-# Copyright (C) 2020-2021 Barcelona Supercomputing Center (BSC)
-
-# The Nanos6 default configuration file. More details about the configuration options and the possible
-# values are available on the OmpSs-2 User Guide (https://pm.bsc.es/ftp/ompss-2/doc/user-guide/) or on
-# the README.md in the Nanos6 repository (https://github.com/bsc-pm/nanos6)
-
 [version]
 	# Choose whether the runtime runs with debug symbols and internal asserts. Enabling this option
 	# may produce significant overheads, so production or performance executions should disable this
diff --git a/test/rt/nanos6/nested-task.c b/test/rt/nanos6/nested-task.c
index 9836a4f..63a9e5d 100644
--- a/test/rt/nanos6/nested-task.c
+++ b/test/rt/nanos6/nested-task.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 int main(void)
 {
 	#pragma oss task
diff --git a/test/rt/nanos6/several-tasks.c b/test/rt/nanos6/several-tasks.c
index 3817499..b73881e 100644
--- a/test/rt/nanos6/several-tasks.c
+++ b/test/rt/nanos6/several-tasks.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 int main(void)
 {
 	for(int i = 0; i < 5000; i++)
diff --git a/test/rt/nanos6/simple-task.c b/test/rt/nanos6/simple-task.c
index 2cd8b16..0299899 100644
--- a/test/rt/nanos6/simple-task.c
+++ b/test/rt/nanos6/simple-task.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 int main(void)
 {
 	#pragma oss task
diff --git a/test/rt/nanos6/taskfor.c b/test/rt/nanos6/taskfor.c
index 4876e9e..e9297d5 100644
--- a/test/rt/nanos6/taskfor.c
+++ b/test/rt/nanos6/taskfor.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 #define _GNU_SOURCE
 #include <unistd.h>
 
diff --git a/test/rt/nosv/CMakeLists.txt b/test/rt/nosv/CMakeLists.txt
index 1972998..2faae06 100644
--- a/test/rt/nosv/CMakeLists.txt
+++ b/test/rt/nosv/CMakeLists.txt
@@ -1,18 +1,5 @@
-#
-# Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 find_library(nosv libnosv)
 find_path(NOSV_INCLUDE_DIR nosv.h)
diff --git a/test/rt/nosv/attach.c b/test/rt/nosv/attach.c
index 4751564..9d5d22b 100644
--- a/test/rt/nosv/attach.c
+++ b/test/rt/nosv/attach.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
+
 #define _DEFAULT_SOURCE
 
 #include <unistd.h>
diff --git a/test/rt/nosv/nosv.toml b/test/rt/nosv/nosv.toml
index 8a8e772..809dda3 100644
--- a/test/rt/nosv/nosv.toml
+++ b/test/rt/nosv/nosv.toml
@@ -1,11 +1,3 @@
-# This file is part of nOS-V and is licensed under the terms contained in the COPYING file
-#
-# Copyright (C) 2021-2022 Barcelona Supercomputing Center (BSC)
-
-# Default nOS-V configuration file.
-# Note that every process in the same nOS-V instance should load an identical configuration file,
-# otherwise, the behaviour is unspecified
-
 # Shared memory configuration
 [shared_memory]
 	# Name of the shared memory section. This can be leveraged to create two separate nOS-V instances
diff --git a/trace.c b/trace.c
index aa716bd..a024b2c 100644
--- a/trace.c
+++ b/trace.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021-2022 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include "trace.h"
 
diff --git a/trace.h b/trace.h
index 7e22ba9..575e2c8 100644
--- a/trace.h
+++ b/trace.h
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC)
+ * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #ifndef OVNI_TRACE_H
 #define OVNI_TRACE_H