diff --git a/.golangci.yml b/.golangci.yml
index eef1e675c..87371e3f2 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,7 +11,7 @@ linters-settings:
   goheader:
     values:
       regexp:
-        copyright-year: 202[0-1]
+        copyright-year: 20[0-9][0-9]
     template-path: code-header-template.txt
 issues:
   max-issues-per-linter: 0
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
index 0ac63db93..2268406f4 100644
--- a/cmd/controller/main.go
+++ b/cmd/controller/main.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package main
diff --git a/code-header-template.txt b/code-header-template.txt
index fd47ff8ac..fc0cc50f5 100644
--- a/code-header-template.txt
+++ b/code-header-template.txt
@@ -1,2 +1,2 @@
-Copyright {{copyright-year}} VMware, Inc.
+Copyright {{copyright-year}} The Carvel Authors.
 SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/hack/tools.go b/hack/tools.go
index adc6f43e9..62e846309 100644
--- a/hack/tools.go
+++ b/hack/tools.go
@@ -1,8 +1,11 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
+//go:build tools
 // +build tools
 
 package tools
 
-import _ "k8s.io/code-generator"
-import _ "sigs.k8s.io/controller-tools/cmd/controller-gen"
\ No newline at end of file
+import (
+	_ "k8s.io/code-generator"
+	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
+)
diff --git a/pkg/apis/secretgen/v1alpha1/conditions.go b/pkg/apis/secretgen/v1alpha1/conditions.go
index 390925502..085ec11b1 100644
--- a/pkg/apis/secretgen/v1alpha1/conditions.go
+++ b/pkg/apis/secretgen/v1alpha1/conditions.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/doc.go b/pkg/apis/secretgen/v1alpha1/doc.go
index 91be71d12..92f4c337b 100644
--- a/pkg/apis/secretgen/v1alpha1/doc.go
+++ b/pkg/apis/secretgen/v1alpha1/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // +k8s:deepcopy-gen=package
diff --git a/pkg/apis/secretgen/v1alpha1/misc.go b/pkg/apis/secretgen/v1alpha1/misc.go
index 970ad5d28..c9e471e1f 100644
--- a/pkg/apis/secretgen/v1alpha1/misc.go
+++ b/pkg/apis/secretgen/v1alpha1/misc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/register.go b/pkg/apis/secretgen/v1alpha1/register.go
index 1ed209c10..58e48989a 100644
--- a/pkg/apis/secretgen/v1alpha1/register.go
+++ b/pkg/apis/secretgen/v1alpha1/register.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/secret_template.go b/pkg/apis/secretgen/v1alpha1/secret_template.go
index 13ae4ada4..d2704ce22 100644
--- a/pkg/apis/secretgen/v1alpha1/secret_template.go
+++ b/pkg/apis/secretgen/v1alpha1/secret_template.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/status.go b/pkg/apis/secretgen/v1alpha1/status.go
index 47559df35..3046f3a8e 100644
--- a/pkg/apis/secretgen/v1alpha1/status.go
+++ b/pkg/apis/secretgen/v1alpha1/status.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/types_certificate.go b/pkg/apis/secretgen/v1alpha1/types_certificate.go
index 368a47dbf..f68e5bf17 100644
--- a/pkg/apis/secretgen/v1alpha1/types_certificate.go
+++ b/pkg/apis/secretgen/v1alpha1/types_certificate.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/types_password.go b/pkg/apis/secretgen/v1alpha1/types_password.go
index 5014203a8..87e8d5895 100644
--- a/pkg/apis/secretgen/v1alpha1/types_password.go
+++ b/pkg/apis/secretgen/v1alpha1/types_password.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/types_rsa_key.go b/pkg/apis/secretgen/v1alpha1/types_rsa_key.go
index d2f489848..16007b066 100644
--- a/pkg/apis/secretgen/v1alpha1/types_rsa_key.go
+++ b/pkg/apis/secretgen/v1alpha1/types_rsa_key.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen/v1alpha1/types_ssh_key.go b/pkg/apis/secretgen/v1alpha1/types_ssh_key.go
index 6466a6443..bf6fa8e67 100644
--- a/pkg/apis/secretgen/v1alpha1/types_ssh_key.go
+++ b/pkg/apis/secretgen/v1alpha1/types_ssh_key.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen2/v1alpha1/doc.go b/pkg/apis/secretgen2/v1alpha1/doc.go
index 7456494f6..b212578e2 100644
--- a/pkg/apis/secretgen2/v1alpha1/doc.go
+++ b/pkg/apis/secretgen2/v1alpha1/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // +k8s:deepcopy-gen=package
diff --git a/pkg/apis/secretgen2/v1alpha1/misc.go b/pkg/apis/secretgen2/v1alpha1/misc.go
index 970ad5d28..c9e471e1f 100644
--- a/pkg/apis/secretgen2/v1alpha1/misc.go
+++ b/pkg/apis/secretgen2/v1alpha1/misc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen2/v1alpha1/register.go b/pkg/apis/secretgen2/v1alpha1/register.go
index 4f01049e0..22d38ed7b 100644
--- a/pkg/apis/secretgen2/v1alpha1/register.go
+++ b/pkg/apis/secretgen2/v1alpha1/register.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen2/v1alpha1/secret_export.go b/pkg/apis/secretgen2/v1alpha1/secret_export.go
index 249328c9b..69ead6bdc 100644
--- a/pkg/apis/secretgen2/v1alpha1/secret_export.go
+++ b/pkg/apis/secretgen2/v1alpha1/secret_export.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen2/v1alpha1/secret_import.go b/pkg/apis/secretgen2/v1alpha1/secret_import.go
index ab02b3ece..7092d2a70 100644
--- a/pkg/apis/secretgen2/v1alpha1/secret_import.go
+++ b/pkg/apis/secretgen2/v1alpha1/secret_import.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/apis/secretgen2/v1alpha1/secret_template.go b/pkg/apis/secretgen2/v1alpha1/secret_template.go
index 9b384b663..bf19a7225 100644
--- a/pkg/apis/secretgen2/v1alpha1/secret_template.go
+++ b/pkg/apis/secretgen2/v1alpha1/secret_template.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/pkg/expansion/doc.go b/pkg/expansion/doc.go
index c83234ffb..a39e265ed 100644
--- a/pkg/expansion/doc.go
+++ b/pkg/expansion/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // Package taken from https://github.com/kubernetes/kubernetes/tree/a98c559ca4b6946bdf15fcbad7d5c450283c2f9f/third_party/forked/golang/expansion
diff --git a/pkg/expansion/expand.go b/pkg/expansion/expand.go
index 8beb1943e..4e284bbce 100644
--- a/pkg/expansion/expand.go
+++ b/pkg/expansion/expand.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package expansion
diff --git a/pkg/expansion/expand_test.go b/pkg/expansion/expand_test.go
index b93c5c805..2ce0bb58c 100644
--- a/pkg/expansion/expand_test.go
+++ b/pkg/expansion/expand_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package expansion_test
diff --git a/pkg/generator/certificate_reconciler.go b/pkg/generator/certificate_reconciler.go
index 3deced02c..080fb171b 100644
--- a/pkg/generator/certificate_reconciler.go
+++ b/pkg/generator/certificate_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/certs_loader.go b/pkg/generator/certs_loader.go
index a4ba30e11..c0a1b2057 100644
--- a/pkg/generator/certs_loader.go
+++ b/pkg/generator/certs_loader.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/generate_inputs.go b/pkg/generator/generate_inputs.go
index 93fafe300..43b8a2c30 100644
--- a/pkg/generator/generate_inputs.go
+++ b/pkg/generator/generate_inputs.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/generate_inputs_test.go b/pkg/generator/generate_inputs_test.go
index 63c84ef2f..4c27a7fb0 100644
--- a/pkg/generator/generate_inputs_test.go
+++ b/pkg/generator/generate_inputs_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator_test
diff --git a/pkg/generator/jsonpath.go b/pkg/generator/jsonpath.go
index 1ad429c27..a37d30930 100644
--- a/pkg/generator/jsonpath.go
+++ b/pkg/generator/jsonpath.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/jsonpath_test.go b/pkg/generator/jsonpath_test.go
index 088acbc2b..02c965b50 100644
--- a/pkg/generator/jsonpath_test.go
+++ b/pkg/generator/jsonpath_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator_test
diff --git a/pkg/generator/password_reconciler.go b/pkg/generator/password_reconciler.go
index 44f0bf0c0..091e25dcc 100644
--- a/pkg/generator/password_reconciler.go
+++ b/pkg/generator/password_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/rsa_key_reconciler.go b/pkg/generator/rsa_key_reconciler.go
index 6fb497c4e..7e96f58d6 100644
--- a/pkg/generator/rsa_key_reconciler.go
+++ b/pkg/generator/rsa_key_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/secret_template_reconciler.go b/pkg/generator/secret_template_reconciler.go
index 6e96f02c7..a113ffb07 100644
--- a/pkg/generator/secret_template_reconciler.go
+++ b/pkg/generator/secret_template_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/secret_template_test.go b/pkg/generator/secret_template_test.go
index a24eed5ff..bbbf4c25f 100644
--- a/pkg/generator/secret_template_test.go
+++ b/pkg/generator/secret_template_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator_test
diff --git a/pkg/generator/service_account_loader.go b/pkg/generator/service_account_loader.go
index 9ad8ddd83..127226f2f 100644
--- a/pkg/generator/service_account_loader.go
+++ b/pkg/generator/service_account_loader.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/generator/ssh_key_reconciler.go b/pkg/generator/ssh_key_reconciler.go
index e4c021d81..d7712942c 100644
--- a/pkg/generator/ssh_key_reconciler.go
+++ b/pkg/generator/ssh_key_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package generator
diff --git a/pkg/reconciler/secret.go b/pkg/reconciler/secret.go
index e98f2d662..d777df15c 100644
--- a/pkg/reconciler/secret.go
+++ b/pkg/reconciler/secret.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package reconciler
diff --git a/pkg/reconciler/status.go b/pkg/reconciler/status.go
index 13db7dbf1..3c1416192 100644
--- a/pkg/reconciler/status.go
+++ b/pkg/reconciler/status.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package reconciler
diff --git a/pkg/satoken/token_manager.go b/pkg/satoken/token_manager.go
index 58f94c3ec..d231c0552 100644
--- a/pkg/satoken/token_manager.go
+++ b/pkg/satoken/token_manager.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // This file is a modified version of
diff --git a/pkg/satoken/token_manager_test.go b/pkg/satoken/token_manager_test.go
index 0766cfb90..6a050bcd9 100644
--- a/pkg/satoken/token_manager_test.go
+++ b/pkg/satoken/token_manager_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // This file is a modified version of
diff --git a/pkg/sharing/doc.go b/pkg/sharing/doc.go
index 20dc43232..121c44e4b 100644
--- a/pkg/sharing/doc.go
+++ b/pkg/sharing/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // sharing package introduces SecretExport and SecretImport concepts
diff --git a/pkg/sharing/dockerconfigjson.go b/pkg/sharing/dockerconfigjson.go
index cd421fc88..8fa378d16 100644
--- a/pkg/sharing/dockerconfigjson.go
+++ b/pkg/sharing/dockerconfigjson.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/dockerconfigjson_test.go b/pkg/sharing/dockerconfigjson_test.go
index 107132590..01e9598cb 100644
--- a/pkg/sharing/dockerconfigjson_test.go
+++ b/pkg/sharing/dockerconfigjson_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/helpers_for_test.go b/pkg/sharing/helpers_for_test.go
index 141158982..196b1f5be 100644
--- a/pkg/sharing/helpers_for_test.go
+++ b/pkg/sharing/helpers_for_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing_test
diff --git a/pkg/sharing/import_secret_test.go b/pkg/sharing/import_secret_test.go
index 2ee1c16fd..3a94a9838 100644
--- a/pkg/sharing/import_secret_test.go
+++ b/pkg/sharing/import_secret_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing_test
diff --git a/pkg/sharing/namespace_wildcard_exclusions.go b/pkg/sharing/namespace_wildcard_exclusions.go
index 454226134..dd32b9d64 100644
--- a/pkg/sharing/namespace_wildcard_exclusions.go
+++ b/pkg/sharing/namespace_wildcard_exclusions.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/placeholder_secret_test.go b/pkg/sharing/placeholder_secret_test.go
index f817827a4..ea4e3d105 100644
--- a/pkg/sharing/placeholder_secret_test.go
+++ b/pkg/sharing/placeholder_secret_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing_test
diff --git a/pkg/sharing/secret_export_reconciler.go b/pkg/sharing/secret_export_reconciler.go
index be1891887..65533c912 100644
--- a/pkg/sharing/secret_export_reconciler.go
+++ b/pkg/sharing/secret_export_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/secret_exports.go b/pkg/sharing/secret_exports.go
index 05cf346b7..44da09e20 100644
--- a/pkg/sharing/secret_exports.go
+++ b/pkg/sharing/secret_exports.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/secret_exports_test.go b/pkg/sharing/secret_exports_test.go
index c9273ed10..be9d3c042 100644
--- a/pkg/sharing/secret_exports_test.go
+++ b/pkg/sharing/secret_exports_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing_test
diff --git a/pkg/sharing/secret_exports_warmed_up.go b/pkg/sharing/secret_exports_warmed_up.go
index c689be6c4..ffe59f706 100644
--- a/pkg/sharing/secret_exports_warmed_up.go
+++ b/pkg/sharing/secret_exports_warmed_up.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/secret_import_reconciler.go b/pkg/sharing/secret_import_reconciler.go
index 941d7bafb..5eb7bad1b 100644
--- a/pkg/sharing/secret_import_reconciler.go
+++ b/pkg/sharing/secret_import_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/sharing/secret_reconciler.go b/pkg/sharing/secret_reconciler.go
index 4c3580ee2..0b7e649eb 100644
--- a/pkg/sharing/secret_reconciler.go
+++ b/pkg/sharing/secret_reconciler.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package sharing
diff --git a/pkg/tracker/tracker.go b/pkg/tracker/tracker.go
index fcd96484b..388faf801 100644
--- a/pkg/tracker/tracker.go
+++ b/pkg/tracker/tracker.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // Package tracker allows "tracking" resources to monitor "tracked" resources.
diff --git a/pkg/tracker/tracker_test.go b/pkg/tracker/tracker_test.go
index cda5425ea..64882dd95 100644
--- a/pkg/tracker/tracker_test.go
+++ b/pkg/tracker/tracker_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package tracker_test
diff --git a/test/e2e/certificate_test.go b/test/e2e/certificate_test.go
index 9ecd40c4e..4f5a7b3e8 100644
--- a/test/e2e/certificate_test.go
+++ b/test/e2e/certificate_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index cf7be39a0..f4d8b88bc 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/env.go b/test/e2e/env.go
index 4db9373eb..9167b6e38 100644
--- a/test/e2e/env.go
+++ b/test/e2e/env.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/kapp.go b/test/e2e/kapp.go
index 79e2d1c39..baa7e78f1 100644
--- a/test/e2e/kapp.go
+++ b/test/e2e/kapp.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go
index a116c9874..94c633834 100644
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/password_test.go b/test/e2e/password_test.go
index 54f25af94..59e72ad86 100644
--- a/test/e2e/password_test.go
+++ b/test/e2e/password_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/placeholder_secrets_multi_case_test.go b/test/e2e/placeholder_secrets_multi_case_test.go
index 613a56805..e71e6a66e 100644
--- a/test/e2e/placeholder_secrets_multi_case_test.go
+++ b/test/e2e/placeholder_secrets_multi_case_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/rsa_key_test.go b/test/e2e/rsa_key_test.go
index b1a16536c..f14d70768 100644
--- a/test/e2e/rsa_key_test.go
+++ b/test/e2e/rsa_key_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/secret_exports_test.go b/test/e2e/secret_exports_test.go
index 7af76bc38..f206bca0d 100644
--- a/test/e2e/secret_exports_test.go
+++ b/test/e2e/secret_exports_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/secret_template_test.go b/test/e2e/secret_template_test.go
index a91a47d47..042a55848 100644
--- a/test/e2e/secret_template_test.go
+++ b/test/e2e/secret_template_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/ssh_key_test.go b/test/e2e/ssh_key_test.go
index da00af448..f4bfefab3 100644
--- a/test/e2e/ssh_key_test.go
+++ b/test/e2e/ssh_key_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/wait.go b/test/e2e/wait.go
index 3ab416151..edbde1ee0 100644
--- a/test/e2e/wait.go
+++ b/test/e2e/wait.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e