diff --git a/aws/apis.go b/aws/apis.go
index ecdde2d..f215ff9 100644
--- a/aws/apis.go
+++ b/aws/apis.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package aws
 
 import (
diff --git a/aws/prepper.go b/aws/prepper.go
index 884e099..9e6daac 100644
--- a/aws/prepper.go
+++ b/aws/prepper.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package aws
 
 import (
diff --git a/aws/uploader.go b/aws/uploader.go
index f6f6ad9..3785f6a 100644
--- a/aws/uploader.go
+++ b/aws/uploader.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package aws
 
 import (
diff --git a/azure/apis.go b/azure/apis.go
index 09fefd4..b94bb91 100644
--- a/azure/apis.go
+++ b/azure/apis.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package azure
 
 import (
diff --git a/azure/disktype.go b/azure/disktype.go
index f8c17c5..29e2745 100644
--- a/azure/disktype.go
+++ b/azure/disktype.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package azure
 
 import "strings"
diff --git a/azure/prepper.go b/azure/prepper.go
index d9160d7..132744c 100644
--- a/azure/prepper.go
+++ b/azure/prepper.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package azure
 
 import (
diff --git a/azure/uploader.go b/azure/uploader.go
index eeeb95d..5a74642 100644
--- a/azure/uploader.go
+++ b/azure/uploader.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package azure
 
 import (
diff --git a/azure/vhd.go b/azure/vhd.go
index 05bf7c1..e36e967 100644
--- a/azure/vhd.go
+++ b/azure/vhd.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package azure
 
 import (
diff --git a/cmd.go b/cmd.go
index 86286fa..d9ea341 100644
--- a/cmd.go
+++ b/cmd.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package main
 
 import (
diff --git a/cmd_test.go b/cmd_test.go
index e6fe927..d84956b 100644
--- a/cmd_test.go
+++ b/cmd_test.go
@@ -1,3 +1,9 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package main
 
 import (
diff --git a/config/config.go b/config/config.go
index e82ffa3..6840b55 100644
--- a/config/config.go
+++ b/config/config.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package config
 
 import (
diff --git a/config/config_test.go b/config/config_test.go
index ddd7f38..2e2f667 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package config
 
 import (
diff --git a/config/option.go b/config/option.go
index 15f60cf..0118bf3 100644
--- a/config/option.go
+++ b/config/option.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package config
 
 import (
diff --git a/config/option_test.go b/config/option_test.go
index 92599f3..ebd0157 100644
--- a/config/option_test.go
+++ b/config/option_test.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package config
 
 import (
diff --git a/config/validation.go b/config/validation.go
index 83f6f0a..bf6925b 100644
--- a/config/validation.go
+++ b/config/validation.go
@@ -1,3 +1,9 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package config
 
 import (
diff --git a/config/validation_test.go b/config/validation_test.go
index a10a6c0..9c35deb 100644
--- a/config/validation_test.go
+++ b/config/validation_test.go
@@ -1,3 +1,9 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package config
 
 import (
diff --git a/gcp/apis.go b/gcp/apis.go
index 0459bd3..7a959df 100644
--- a/gcp/apis.go
+++ b/gcp/apis.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package gcp
 
 import (
diff --git a/gcp/prepper.go b/gcp/prepper.go
index 2ec7d50..6b4079c 100644
--- a/gcp/prepper.go
+++ b/gcp/prepper.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package gcp
 
 import (
diff --git a/gcp/uploader.go b/gcp/uploader.go
index fa1ee30..8566e36 100644
--- a/gcp/uploader.go
+++ b/gcp/uploader.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package gcp
 
 import (
diff --git a/main.go b/main.go
index 1536493..d2cb2a6 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ Copyright (c) Edgeless Systems GmbH
 
 SPDX-License-Identifier: Apache-2.0
 */
+
 package main
 
 import (
diff --git a/template/template.go b/template/template.go
index 8303cb5..705e4cb 100644
--- a/template/template.go
+++ b/template/template.go
@@ -1,3 +1,9 @@
+/*
+Copyright (c) Edgeless Systems GmbH
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
 package template
 
 import "strings"