diff --git a/cmd/vendir/vendir.go b/cmd/vendir/vendir.go
index ca93e3ef..b7d86e63 100644
--- a/cmd/vendir/vendir.go
+++ b/cmd/vendir/vendir.go
@@ -1,4 +1,4 @@
-// Copyright 2020 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 10eb5a1b..77e3f765 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
diff --git a/hack/tools.go b/hack/tools.go
index a6b65e13..3648e854 100644
--- a/hack/tools.go
+++ b/hack/tools.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // +build tools
diff --git a/pkg/vendir/cmd/sort_semver.go b/pkg/vendir/cmd/sort_semver.go
index 774a96a5..7ab928eb 100644
--- a/pkg/vendir/cmd/sort_semver.go
+++ b/pkg/vendir/cmd/sort_semver.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/cmd/sync.go b/pkg/vendir/cmd/sync.go
index c6d06926..4e2cc816 100644
--- a/pkg/vendir/cmd/sync.go
+++ b/pkg/vendir/cmd/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/cmd/tools.go b/pkg/vendir/cmd/tools.go
index 615014e9..4d5d75d6 100644
--- a/pkg/vendir/cmd/tools.go
+++ b/pkg/vendir/cmd/tools.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/cmd/ui_flags.go b/pkg/vendir/cmd/ui_flags.go
index 07dee17f..7377ddff 100644
--- a/pkg/vendir/cmd/ui_flags.go
+++ b/pkg/vendir/cmd/ui_flags.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/cmd/vendir.go b/pkg/vendir/cmd/vendir.go
index 1f364879..a16722e5 100644
--- a/pkg/vendir/cmd/vendir.go
+++ b/pkg/vendir/cmd/vendir.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/cmd/version.go b/pkg/vendir/cmd/version.go
index 38a8447f..a26ff3d5 100644
--- a/pkg/vendir/cmd/version.go
+++ b/pkg/vendir/cmd/version.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cmd
diff --git a/pkg/vendir/config/config.go b/pkg/vendir/config/config.go
index d09c765c..f56b2536 100644
--- a/pkg/vendir/config/config.go
+++ b/pkg/vendir/config/config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/config_test.go b/pkg/vendir/config/config_test.go
index a0e38b35..528cf058 100644
--- a/pkg/vendir/config/config_test.go
+++ b/pkg/vendir/config/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config_test
diff --git a/pkg/vendir/config/data.go b/pkg/vendir/config/data.go
index b12c0857..62ac44a3 100644
--- a/pkg/vendir/config/data.go
+++ b/pkg/vendir/config/data.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/directory.go b/pkg/vendir/config/directory.go
index 80622021..ffb0472f 100644
--- a/pkg/vendir/config/directory.go
+++ b/pkg/vendir/config/directory.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/doc.go b/pkg/vendir/config/doc.go
index 67c69109..5ebe798f 100644
--- a/pkg/vendir/config/doc.go
+++ b/pkg/vendir/config/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 // Package config contains logic for parsing config.
diff --git a/pkg/vendir/config/dockerconfigjson.go b/pkg/vendir/config/dockerconfigjson.go
index e325977b..963abfcd 100644
--- a/pkg/vendir/config/dockerconfigjson.go
+++ b/pkg/vendir/config/dockerconfigjson.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/dockerconfigjson_test.go b/pkg/vendir/config/dockerconfigjson_test.go
index 6c7b31c6..823f9797 100644
--- a/pkg/vendir/config/dockerconfigjson_test.go
+++ b/pkg/vendir/config/dockerconfigjson_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config_test
diff --git a/pkg/vendir/config/lock_config.go b/pkg/vendir/config/lock_config.go
index dcbea0f8..828503b0 100644
--- a/pkg/vendir/config/lock_config.go
+++ b/pkg/vendir/config/lock_config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/lock_config_test.go b/pkg/vendir/config/lock_config_test.go
index 10c73c9d..d15efdcb 100644
--- a/pkg/vendir/config/lock_config_test.go
+++ b/pkg/vendir/config/lock_config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config_test
diff --git a/pkg/vendir/config/lock_directory.go b/pkg/vendir/config/lock_directory.go
index 3e239f7c..2fd4db2d 100644
--- a/pkg/vendir/config/lock_directory.go
+++ b/pkg/vendir/config/lock_directory.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/config/resources.go b/pkg/vendir/config/resources.go
index 3497b789..06698af8 100644
--- a/pkg/vendir/config/resources.go
+++ b/pkg/vendir/config/resources.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package config
diff --git a/pkg/vendir/directory/directory.go b/pkg/vendir/directory/directory.go
index b8e82049..be2f89cf 100644
--- a/pkg/vendir/directory/directory.go
+++ b/pkg/vendir/directory/directory.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+
 	"sigs.k8s.io/yaml"
 
 	ctlconf "carvel.dev/vendir/pkg/vendir/config"
diff --git a/pkg/vendir/directory/file_filter.go b/pkg/vendir/directory/file_filter.go
index 6a5c4e36..bff85268 100644
--- a/pkg/vendir/directory/file_filter.go
+++ b/pkg/vendir/directory/file_filter.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/info_log.go b/pkg/vendir/directory/info_log.go
index 4ab930ac..30ca1723 100644
--- a/pkg/vendir/directory/info_log.go
+++ b/pkg/vendir/directory/info_log.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/named_ref_fetcher.go b/pkg/vendir/directory/named_ref_fetcher.go
index 19bcd708..5010c154 100644
--- a/pkg/vendir/directory/named_ref_fetcher.go
+++ b/pkg/vendir/directory/named_ref_fetcher.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/staging_dir.go b/pkg/vendir/directory/staging_dir.go
index f7340cf3..fbae9777 100644
--- a/pkg/vendir/directory/staging_dir.go
+++ b/pkg/vendir/directory/staging_dir.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/sub_path.go b/pkg/vendir/directory/sub_path.go
index 53cc3025..2a7ed61f 100644
--- a/pkg/vendir/directory/sub_path.go
+++ b/pkg/vendir/directory/sub_path.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/symlink.go b/pkg/vendir/directory/symlink.go
index c037ab17..f101cd82 100644
--- a/pkg/vendir/directory/symlink.go
+++ b/pkg/vendir/directory/symlink.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/directory/symlink_test.go b/pkg/vendir/directory/symlink_test.go
index 54ffa926..0748bae3 100644
--- a/pkg/vendir/directory/symlink_test.go
+++ b/pkg/vendir/directory/symlink_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package directory
diff --git a/pkg/vendir/fetch/archive.go b/pkg/vendir/fetch/archive.go
index d5ec475e..4ae2a60d 100644
--- a/pkg/vendir/fetch/archive.go
+++ b/pkg/vendir/fetch/archive.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package fetch
diff --git a/pkg/vendir/fetch/cache/cache.go b/pkg/vendir/fetch/cache/cache.go
index 9c3aca9d..c44619f7 100644
--- a/pkg/vendir/fetch/cache/cache.go
+++ b/pkg/vendir/fetch/cache/cache.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cache
diff --git a/pkg/vendir/fetch/cache/cache_test.go b/pkg/vendir/fetch/cache/cache_test.go
index 3ebe17a9..48d62de2 100644
--- a/pkg/vendir/fetch/cache/cache_test.go
+++ b/pkg/vendir/fetch/cache/cache_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package cache_test
diff --git a/pkg/vendir/fetch/cache/resources/amount.go b/pkg/vendir/fetch/cache/resources/amount.go
index f9730711..d991718d 100644
--- a/pkg/vendir/fetch/cache/resources/amount.go
+++ b/pkg/vendir/fetch/cache/resources/amount.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package resources
diff --git a/pkg/vendir/fetch/cache/resources/math.go b/pkg/vendir/fetch/cache/resources/math.go
index 2a89c195..505262ec 100644
--- a/pkg/vendir/fetch/cache/resources/math.go
+++ b/pkg/vendir/fetch/cache/resources/math.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package resources
diff --git a/pkg/vendir/fetch/cache/resources/quantity.go b/pkg/vendir/fetch/cache/resources/quantity.go
index 1e91e311..8234b674 100644
--- a/pkg/vendir/fetch/cache/resources/quantity.go
+++ b/pkg/vendir/fetch/cache/resources/quantity.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package resources
diff --git a/pkg/vendir/fetch/cache/resources/scale_int.go b/pkg/vendir/fetch/cache/resources/scale_int.go
index 00a03a52..3646f92f 100644
--- a/pkg/vendir/fetch/cache/resources/scale_int.go
+++ b/pkg/vendir/fetch/cache/resources/scale_int.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package resources
diff --git a/pkg/vendir/fetch/cache/resources/suffix.go b/pkg/vendir/fetch/cache/resources/suffix.go
index e7799b78..d671ad8e 100644
--- a/pkg/vendir/fetch/cache/resources/suffix.go
+++ b/pkg/vendir/fetch/cache/resources/suffix.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package resources
diff --git a/pkg/vendir/fetch/git/git.go b/pkg/vendir/fetch/git/git.go
index 74866932..644a9ed3 100644
--- a/pkg/vendir/fetch/git/git.go
+++ b/pkg/vendir/fetch/git/git.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package git
diff --git a/pkg/vendir/fetch/git/git_test.go b/pkg/vendir/fetch/git/git_test.go
index 650c5ba9..c6a4de08 100644
--- a/pkg/vendir/fetch/git/git_test.go
+++ b/pkg/vendir/fetch/git/git_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package git_test
diff --git a/pkg/vendir/fetch/git/line_section_reader.go b/pkg/vendir/fetch/git/line_section_reader.go
index f01d03b0..551a63aa 100644
--- a/pkg/vendir/fetch/git/line_section_reader.go
+++ b/pkg/vendir/fetch/git/line_section_reader.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package git
diff --git a/pkg/vendir/fetch/git/sync.go b/pkg/vendir/fetch/git/sync.go
index e4e25835..ec08611d 100644
--- a/pkg/vendir/fetch/git/sync.go
+++ b/pkg/vendir/fetch/git/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package git
diff --git a/pkg/vendir/fetch/git/verification.go b/pkg/vendir/fetch/git/verification.go
index fb2bd59e..3df98320 100644
--- a/pkg/vendir/fetch/git/verification.go
+++ b/pkg/vendir/fetch/git/verification.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package git
diff --git a/pkg/vendir/fetch/githubrelease/release_notes_checksums.go b/pkg/vendir/fetch/githubrelease/release_notes_checksums.go
index d6733645..6f79f0a9 100644
--- a/pkg/vendir/fetch/githubrelease/release_notes_checksums.go
+++ b/pkg/vendir/fetch/githubrelease/release_notes_checksums.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package githubrelease
diff --git a/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go b/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go
index 3b102e81..520d0b94 100644
--- a/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go
+++ b/pkg/vendir/fetch/githubrelease/release_notes_checksums_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package githubrelease_test
diff --git a/pkg/vendir/fetch/githubrelease/sync.go b/pkg/vendir/fetch/githubrelease/sync.go
index 43e42fd1..2b9c79c6 100644
--- a/pkg/vendir/fetch/githubrelease/sync.go
+++ b/pkg/vendir/fetch/githubrelease/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package githubrelease
diff --git a/pkg/vendir/fetch/helmchart/http_source.go b/pkg/vendir/fetch/helmchart/http_source.go
index 0d8c287b..f0481ee6 100644
--- a/pkg/vendir/fetch/helmchart/http_source.go
+++ b/pkg/vendir/fetch/helmchart/http_source.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package helmchart
diff --git a/pkg/vendir/fetch/helmchart/oci_source.go b/pkg/vendir/fetch/helmchart/oci_source.go
index ee2462b0..4fb6aeb6 100644
--- a/pkg/vendir/fetch/helmchart/oci_source.go
+++ b/pkg/vendir/fetch/helmchart/oci_source.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package helmchart
diff --git a/pkg/vendir/fetch/helmchart/sync.go b/pkg/vendir/fetch/helmchart/sync.go
index 797289a0..b5e149ab 100644
--- a/pkg/vendir/fetch/helmchart/sync.go
+++ b/pkg/vendir/fetch/helmchart/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package helmchart
diff --git a/pkg/vendir/fetch/hg/hg.go b/pkg/vendir/fetch/hg/hg.go
index a3f50937..0bf11e4d 100644
--- a/pkg/vendir/fetch/hg/hg.go
+++ b/pkg/vendir/fetch/hg/hg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package hg
diff --git a/pkg/vendir/fetch/hg/sync.go b/pkg/vendir/fetch/hg/sync.go
index 4d36ae0a..abfb44fe 100644
--- a/pkg/vendir/fetch/hg/sync.go
+++ b/pkg/vendir/fetch/hg/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package hg
diff --git a/pkg/vendir/fetch/http/sync.go b/pkg/vendir/fetch/http/sync.go
index fa63166b..f2eb664a 100644
--- a/pkg/vendir/fetch/http/sync.go
+++ b/pkg/vendir/fetch/http/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package http
diff --git a/pkg/vendir/fetch/image/guessed_ref.go b/pkg/vendir/fetch/image/guessed_ref.go
index a6da0728..5a59ef4d 100644
--- a/pkg/vendir/fetch/image/guessed_ref.go
+++ b/pkg/vendir/fetch/image/guessed_ref.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package image
diff --git a/pkg/vendir/fetch/image/guessed_ref_test.go b/pkg/vendir/fetch/image/guessed_ref_test.go
index ddc173c2..8322c2f0 100644
--- a/pkg/vendir/fetch/image/guessed_ref_test.go
+++ b/pkg/vendir/fetch/image/guessed_ref_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package image_test
diff --git a/pkg/vendir/fetch/image/imgpkg.go b/pkg/vendir/fetch/image/imgpkg.go
index 01a73b22..d45f10ee 100644
--- a/pkg/vendir/fetch/image/imgpkg.go
+++ b/pkg/vendir/fetch/image/imgpkg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package image
diff --git a/pkg/vendir/fetch/image/imgpkg_test.go b/pkg/vendir/fetch/image/imgpkg_test.go
index ca5aa9dc..592a4b0c 100644
--- a/pkg/vendir/fetch/image/imgpkg_test.go
+++ b/pkg/vendir/fetch/image/imgpkg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package image_test
diff --git a/pkg/vendir/fetch/image/sync.go b/pkg/vendir/fetch/image/sync.go
index 1590b320..e9901a0e 100644
--- a/pkg/vendir/fetch/image/sync.go
+++ b/pkg/vendir/fetch/image/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package image
diff --git a/pkg/vendir/fetch/imgpkgbundle/sync.go b/pkg/vendir/fetch/imgpkgbundle/sync.go
index 1d293dc7..fafda78e 100644
--- a/pkg/vendir/fetch/imgpkgbundle/sync.go
+++ b/pkg/vendir/fetch/imgpkgbundle/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2021 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 package imgpkgbundle
 
diff --git a/pkg/vendir/fetch/inline/sync.go b/pkg/vendir/fetch/inline/sync.go
index 72226fcd..3fb007e8 100644
--- a/pkg/vendir/fetch/inline/sync.go
+++ b/pkg/vendir/fetch/inline/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package inline
diff --git a/pkg/vendir/fetch/move.go b/pkg/vendir/fetch/move.go
index 217fdd29..b3c56bbc 100644
--- a/pkg/vendir/fetch/move.go
+++ b/pkg/vendir/fetch/move.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package fetch
diff --git a/pkg/vendir/fetch/move_test.go b/pkg/vendir/fetch/move_test.go
index b9951ea4..3173ebe5 100644
--- a/pkg/vendir/fetch/move_test.go
+++ b/pkg/vendir/fetch/move_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package fetch_test
diff --git a/pkg/vendir/fetch/ref_fetcher.go b/pkg/vendir/fetch/ref_fetcher.go
index b4f1e596..d1974ec8 100644
--- a/pkg/vendir/fetch/ref_fetcher.go
+++ b/pkg/vendir/fetch/ref_fetcher.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package fetch
diff --git a/pkg/vendir/fetch/temp_area.go b/pkg/vendir/fetch/temp_area.go
index 67bf4b1a..a82f10b2 100644
--- a/pkg/vendir/fetch/temp_area.go
+++ b/pkg/vendir/fetch/temp_area.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package fetch
diff --git a/pkg/vendir/openpgparmor/armor.go b/pkg/vendir/openpgparmor/armor.go
index 716d9ad8..28bdbf6e 100644
--- a/pkg/vendir/openpgparmor/armor.go
+++ b/pkg/vendir/openpgparmor/armor.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package openpgparmor
diff --git a/pkg/vendir/version/version.go b/pkg/vendir/version/version.go
index 5a43c61f..1101b4a0 100644
--- a/pkg/vendir/version/version.go
+++ b/pkg/vendir/version/version.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package version
diff --git a/pkg/vendir/versions/selector.go b/pkg/vendir/versions/selector.go
index 14ed3311..131eff29 100644
--- a/pkg/vendir/versions/selector.go
+++ b/pkg/vendir/versions/selector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package versions
diff --git a/pkg/vendir/versions/semvers.go b/pkg/vendir/versions/semvers.go
index 29cba730..e315367c 100644
--- a/pkg/vendir/versions/semvers.go
+++ b/pkg/vendir/versions/semvers.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package versions
diff --git a/pkg/vendir/versions/semvers_test.go b/pkg/vendir/versions/semvers_test.go
index 194cfdc3..fc7cdabc 100644
--- a/pkg/vendir/versions/semvers_test.go
+++ b/pkg/vendir/versions/semvers_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package versions_test
diff --git a/pkg/vendir/versions/v1alpha1/config.go b/pkg/vendir/versions/v1alpha1/config.go
index 02011d05..080fd0b8 100644
--- a/pkg/vendir/versions/v1alpha1/config.go
+++ b/pkg/vendir/versions/v1alpha1/config.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
diff --git a/test/e2e/concurrent_processes_test.go b/test/e2e/concurrent_processes_test.go
index 06ca7dd1..3ceaa858 100644
--- a/test/e2e/concurrent_processes_test.go
+++ b/test/e2e/concurrent_processes_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/directory_flag_test.go b/test/e2e/directory_flag_test.go
index 0906f2b6..76ce83f3 100644
--- a/test/e2e/directory_flag_test.go
+++ b/test/e2e/directory_flag_test.go
@@ -1,12 +1,13 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
 
 import (
-	"github.com/stretchr/testify/require"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestUseDirectory(t *testing.T) {
diff --git a/test/e2e/directory_permissions_test.go b/test/e2e/directory_permissions_test.go
index 4645f455..bebb92d3 100644
--- a/test/e2e/directory_permissions_test.go
+++ b/test/e2e/directory_permissions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 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 0ec33279..f4d8b88b 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -1,4 +1,4 @@
-// Copyright 2020 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 968f9698..9dc06baf 100644
--- a/test/e2e/env.go
+++ b/test/e2e/env.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/example.go b/test/e2e/example.go
index 9260ff83..6b437a2f 100644
--- a/test/e2e/example.go
+++ b/test/e2e/example.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/example_git_and_manual_test.go b/test/e2e/example_git_and_manual_test.go
index 66e0667e..37af744e 100644
--- a/test/e2e/example_git_and_manual_test.go
+++ b/test/e2e/example_git_and_manual_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/example_lazy_test.go b/test/e2e/example_lazy_test.go
index fe969310..6bc0e84c 100644
--- a/test/e2e/example_lazy_test.go
+++ b/test/e2e/example_lazy_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/example_locked_test.go b/test/e2e/example_locked_test.go
index e5b4b383..39001af2 100644
--- a/test/e2e/example_locked_test.go
+++ b/test/e2e/example_locked_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/examples_dir_test.go b/test/e2e/examples_dir_test.go
index bb57c4ff..0da7c8cb 100644
--- a/test/e2e/examples_dir_test.go
+++ b/test/e2e/examples_dir_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/git_test.go b/test/e2e/git_test.go
index 5a8ca3f3..96556c97 100644
--- a/test/e2e/git_test.go
+++ b/test/e2e/git_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/git_util.go b/test/e2e/git_util.go
index 7d42bc41..afa5198d 100644
--- a/test/e2e/git_util.go
+++ b/test/e2e/git_util.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/github_release_test.go b/test/e2e/github_release_test.go
index 446ef487..9e3593e0 100644
--- a/test/e2e/github_release_test.go
+++ b/test/e2e/github_release_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/http_tar_test.go b/test/e2e/http_tar_test.go
index c4503e53..55c2d501 100644
--- a/test/e2e/http_tar_test.go
+++ b/test/e2e/http_tar_test.go
@@ -1,4 +1,4 @@
-// Copyright 2023 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/invalid_symlink_test.go b/test/e2e/invalid_symlink_test.go
index 884ac3d5..bafd3291 100644
--- a/test/e2e/invalid_symlink_test.go
+++ b/test/e2e/invalid_symlink_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/min_version_err_test.go b/test/e2e/min_version_err_test.go
index 1188bc71..85a40ec2 100644
--- a/test/e2e/min_version_err_test.go
+++ b/test/e2e/min_version_err_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/overlapping_dir_err_test.go b/test/e2e/overlapping_dir_err_test.go
index e5d77082..0594e63d 100644
--- a/test/e2e/overlapping_dir_err_test.go
+++ b/test/e2e/overlapping_dir_err_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/secrets_test.go b/test/e2e/secrets_test.go
index eba9fdd1..fcf80fb6 100644
--- a/test/e2e/secrets_test.go
+++ b/test/e2e/secrets_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/vendir.go b/test/e2e/vendir.go
index 3589e973..5edd7c8e 100644
--- a/test/e2e/vendir.go
+++ b/test/e2e/vendir.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
index fc18b782..b2f0e5f1 100644
--- a/test/e2e/version_test.go
+++ b/test/e2e/version_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 VMware, Inc.
+// Copyright 2024 The Carvel Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 package e2e