diff --git a/.clang-format b/.clang-format
index a025446..883d234 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,7 +19,7 @@ AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: false
 BinPackArguments: true
 BinPackParameters: true
-BraceWrapping:   
+BraceWrapping:
   AfterClass:      false
   AfterControlStatement: false
   AfterEnum:       false
@@ -47,7 +47,7 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories: 
+IncludeCategories:
   - Regex:           '^<.*\.h>'
     Priority:        1
   - Regex:           '^<.*'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9a95d72..162b911 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
 #         source ${{ matrix.SETUP }};\
 #         cd build;\
 #         cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_STANDARD=17  -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " -G Ninja ..;'
-#    - name: Compile 
+#    - name: Compile
 #      run: |
 #        docker exec CI_container /bin/bash -c 'cd ./Package;\
 #        source ${{ matrix.SETUP }};\
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15f01ca..a8a0c63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,21 @@
+#[[
+Copyright (c) 2014-2023 Key4hep-Project.
+
+This file is part of Key4hep.
+See https://key4hep.github.io/key4hep-doc/ for further info.
+
+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.
+]]
 CMAKE_MINIMUM_REQUIRED(VERSION 3.18)
 
 project(k4ActsTracking)
diff --git a/empty_alg.py b/empty_alg.py
index 276ca0a..b3f3458 100644
--- a/empty_alg.py
+++ b/empty_alg.py
@@ -1,3 +1,21 @@
+#
+# Copyright (c) 2014-2023 Key4hep-Project.
+#
+# This file is part of Key4hep.
+# See https://key4hep.github.io/key4hep-doc/ for further info.
+#
+# 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.
+#
 import os
 from pprint import pprint
 from Gaudi.Configuration import *
diff --git a/geosvc.py b/geosvc.py
index 559b4d1..51b6c96 100644
--- a/geosvc.py
+++ b/geosvc.py
@@ -1,3 +1,21 @@
+#
+# Copyright (c) 2014-2023 Key4hep-Project.
+#
+# This file is part of Key4hep.
+# See https://key4hep.github.io/key4hep-doc/ for further info.
+#
+# 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.
+#
 import os
 import sys
 from pprint import pprint
diff --git a/k4ActsTracking/CMakeLists.txt b/k4ActsTracking/CMakeLists.txt
index c4a1099..35d9811 100644
--- a/k4ActsTracking/CMakeLists.txt
+++ b/k4ActsTracking/CMakeLists.txt
@@ -1,3 +1,21 @@
+#[[
+Copyright (c) 2014-2023 Key4hep-Project.
+
+This file is part of Key4hep.
+See https://key4hep.github.io/key4hep-doc/ for further info.
+
+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.
+]]
 file(GLOB _plugin_sources src/components/*.cpp)
 gaudi_add_module(k4ActsTrackingPlugins
   SOURCES ${_plugin_sources}
diff --git a/k4ActsTracking/src/components/EmptyAlg.cpp b/k4ActsTracking/src/components/EmptyAlg.cpp
index 16c434a..742c03a 100644
--- a/k4ActsTracking/src/components/EmptyAlg.cpp
+++ b/k4ActsTracking/src/components/EmptyAlg.cpp
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2014-2023 Key4hep-Project.
+ *
+ * This file is part of Key4hep.
+ * See https://key4hep.github.io/key4hep-doc/ for further info.
+ *
+ * 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.
+ */
 #include "EmptyAlg.h"
 
 DECLARE_COMPONENT(EmptyAlg)
diff --git a/k4ActsTracking/src/components/EmptyAlg.h b/k4ActsTracking/src/components/EmptyAlg.h
index e33e143..bac27c3 100644
--- a/k4ActsTracking/src/components/EmptyAlg.h
+++ b/k4ActsTracking/src/components/EmptyAlg.h
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2014-2023 Key4hep-Project.
+ *
+ * This file is part of Key4hep.
+ * See https://key4hep.github.io/key4hep-doc/ for further info.
+ *
+ * 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.
+ */
 #pragma once
 
 // GAUDI
diff --git a/k4ActsTracking/src/components/GeoSvc.cpp b/k4ActsTracking/src/components/GeoSvc.cpp
index eb56996..82b9d6e 100644
--- a/k4ActsTracking/src/components/GeoSvc.cpp
+++ b/k4ActsTracking/src/components/GeoSvc.cpp
@@ -1,5 +1,21 @@
-// D. Elitez, July 2022
-// Based on eic/juggler
+/*
+ * Copyright (c) 2014-2023 Key4hep-Project.
+ *
+ * This file is part of Key4hep.
+ * See https://key4hep.github.io/key4hep-doc/ for further info.
+ *
+ * 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.
+ */
 
 #include "GeoSvc.h"
 #include "Acts/Geometry/TrackingGeometry.hpp"
diff --git a/k4ActsTracking/src/components/GeoSvc.h b/k4ActsTracking/src/components/GeoSvc.h
index 068eae4..01caf4a 100644
--- a/k4ActsTracking/src/components/GeoSvc.h
+++ b/k4ActsTracking/src/components/GeoSvc.h
@@ -1,5 +1,21 @@
-// D. Elitez, July 2022
-// Based on eic/juggler
+/*
+ * Copyright (c) 2014-2023 Key4hep-Project.
+ *
+ * This file is part of Key4hep.
+ * See https://key4hep.github.io/key4hep-doc/ for further info.
+ *
+ * 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.
+ */
 
 #ifndef GEOSVC_H
 #define GEOSVC_H
diff --git a/k4ActsTracking/src/components/IGeoSvc.h b/k4ActsTracking/src/components/IGeoSvc.h
index d77d335..f6f306a 100644
--- a/k4ActsTracking/src/components/IGeoSvc.h
+++ b/k4ActsTracking/src/components/IGeoSvc.h
@@ -1,5 +1,21 @@
-// D. Elitez, July 2022
-// Based on eic/juggler
+/*
+ * Copyright (c) 2014-2023 Key4hep-Project.
+ *
+ * This file is part of Key4hep.
+ * See https://key4hep.github.io/key4hep-doc/ for further info.
+ *
+ * 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.
+ */
 
 #ifndef IGEOSVC_H
 #define IGEOSVC_H