From 6d7e90ad42c3858f69557b20761a8c9bf7fdc65d Mon Sep 17 00:00:00 2001
From: Xander Grzywinski <xandergrzyw@gmail.com>
Date: Thu, 18 Jul 2024 11:40:56 -0400
Subject: [PATCH 1/5] docs: fix codeowners file

Signed-off-by: Xander Grzywinski <xandergrzyw@gmail.com>
---
 CODEOWNERS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index c713375a0d..976d425740 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,5 @@
-* @defenseunicorns/zarf @dgershman
+* @zarf-dev/maintainers @zarf-dev/reviewers
 
-/CODEOWNERS @jeff-mccoy @austenbryan
-/cosign.pub @jeff-mccoy @austenbryan
-/LICENSE @jeff-mccoy @austenbryan
+/CODEOWNERS @zarf-dev/tsc
+/cosign.pub @zarf-dev/tsc
+/LICENSE @zarf-dev/tsc

From 62253cecc6b94cd2d42d79caacf57061dad8548a Mon Sep 17 00:00:00 2001
From: Philip Laine <philip.laine@gmail.com>
Date: Wed, 17 Jul 2024 19:20:44 +0200
Subject: [PATCH 2/5] Rename org name in image references

Signed-off-by: Philip Laine <philip.laine@gmail.com>
---
 .github/workflows/publish-application-packages.yml   |  8 ++++----
 .github/workflows/release.yml                        | 10 +++++-----
 .github/workflows/test-upgrade.yml                   |  2 +-
 Makefile                                             |  2 +-
 src/config/config.go                                 |  2 +-
 src/pkg/zoci/utils.go                                |  2 +-
 src/test/e2e/08_create_differential_test.go          |  2 +-
 src/test/e2e/11_oci_pull_inspect_test.go             |  4 ++--
 src/test/e2e/13_find_images_test.go                  |  2 +-
 src/test/e2e/14_create_sha_index_test.go             |  2 +-
 src/test/e2e/21_connect_creds_test.go                |  2 +-
 src/test/packages/00-remote-pull-fail/zarf.yaml      |  2 +-
 src/test/packages/08-differential-package/zarf.yaml  |  2 +-
 src/test/packages/14-index-sha/image-index/zarf.yaml |  2 +-
 zarf-config.toml                                     |  2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/publish-application-packages.yml b/.github/workflows/publish-application-packages.yml
index c30c7105fa..59be8e3ff3 100644
--- a/.github/workflows/publish-application-packages.yml
+++ b/.github/workflows/publish-application-packages.yml
@@ -23,7 +23,7 @@ jobs:
           ref: ${{ github.event.inputs.branchName }}
 
       - name: Install The Latest Release Version of Zarf
-        uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
+        uses: defenseunicorns/setup-zarf@10e539efed02f75ec39eb8823e22a5c795f492ae #v1.0.1
 
       - name: "Login to GHCR"
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
@@ -39,11 +39,11 @@ jobs:
           zarf package create -o build -a arm64 examples/dos-games --signing-key=awskms:///${{ secrets.COSIGN_AWS_KMS_KEY }} --confirm
 
           # Publish a the signed dos-games package
-          zarf package publish ./build/zarf-package-dos-games-amd64-1.0.0.tar.zst oci://ghcr.io/defenseunicorns/packages --key=https://zarf.dev/cosign.pub
-          zarf package publish ./build/zarf-package-dos-games-arm64-1.0.0.tar.zst oci://ghcr.io/defenseunicorns/packages --key=https://zarf.dev/cosign.pub
+          zarf package publish ./build/zarf-package-dos-games-amd64-1.0.0.tar.zst oci://ghcr.io/zarf-dev/packages --key=https://zarf.dev/cosign.pub
+          zarf package publish ./build/zarf-package-dos-games-arm64-1.0.0.tar.zst oci://ghcr.io/zarf-dev/packages --key=https://zarf.dev/cosign.pub
 
           # Publish a skeleton of the dos-games package
-          zarf package publish examples/dos-games oci://ghcr.io/defenseunicorns/packages
+          zarf package publish examples/dos-games oci://ghcr.io/zarf-dev/packages
         env:
           AWS_REGION: ${{ secrets.COSIGN_AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.COSIGN_AWS_KEY_ID }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f23f8c9c3..f8e6e36604 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,13 +42,13 @@ jobs:
         run: |
           cp build/zarf build/zarf-linux-amd64
           cp build/zarf-arm build/zarf-linux-arm64
-          docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/defenseunicorns/zarf/agent:$GITHUB_REF_NAME .
+          docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/zarf-dev/zarf/agent:$GITHUB_REF_NAME .
           rm build/zarf-linux-amd64
           rm build/zarf-linux-arm64
-          echo ZARF_AGENT_IMAGE_DIGEST=$(docker buildx imagetools inspect ghcr.io/defenseunicorns/zarf/agent:$GITHUB_REF_NAME --format '{{ json . }}' | jq -r .manifest.digest) >> $GITHUB_ENV
+          echo ZARF_AGENT_IMAGE_DIGEST=$(docker buildx imagetools inspect ghcr.io/zarf-dev/zarf/agent:$GITHUB_REF_NAME --format '{{ json . }}' | jq -r .manifest.digest) >> $GITHUB_ENV
 
       - name: "Zarf Agent: Sign the Image"
-        run: cosign sign --key awskms:///${{ secrets.COSIGN_AWS_KMS_KEY }} -a release-engineer=https://github.com/${{ github.actor }} -a version=$GITHUB_REF_NAME ghcr.io/defenseunicorns/zarf/agent@$ZARF_AGENT_IMAGE_DIGEST -y
+        run: cosign sign --key awskms:///${{ secrets.COSIGN_AWS_KMS_KEY }} -a release-engineer=https://github.com/${{ github.actor }} -a version=$GITHUB_REF_NAME ghcr.io/zarf-dev/zarf/agent@$ZARF_AGENT_IMAGE_DIGEST -y
         env:
           COSIGN_EXPERIMENTAL: 1
           AWS_REGION: ${{ secrets.COSIGN_AWS_REGION }}
@@ -63,8 +63,8 @@ jobs:
 
       - name: Publish Init Package as OCI and Skeleton
         run: |
-          make publish-init-package ARCH=amd64 REPOSITORY_URL=ghcr.io/defenseunicorns/packages
-          make publish-init-package ARCH=arm64 REPOSITORY_URL=ghcr.io/defenseunicorns/packages
+          make publish-init-package ARCH=amd64 REPOSITORY_URL=ghcr.io/zerf-dev/packages
+          make publish-init-package ARCH=arm64 REPOSITORY_URL=ghcr.io/zarf-dev/packages
 
       # Create a CVE report based on this build
       - name: Create release time CVE report
diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml
index 4bbcf170b5..552d79e103 100644
--- a/.github/workflows/test-upgrade.yml
+++ b/.github/workflows/test-upgrade.yml
@@ -73,7 +73,7 @@ jobs:
           chmod +x build/zarf
 
       - name: Install release version of Zarf
-        uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
+        uses: defenseunicorns/setup-zarf@10e539efed02f75ec39eb8823e22a5c795f492ae #v1.0.1
         with:
           download-init-package: true
 
diff --git a/Makefile b/Makefile
index 9a4fa4e58e..0f2deebcaf 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ build-local-agent-image: ## Build the Zarf agent image to be used in a locally b
 	@ if [ "$(ARCH)" = "amd64" ]; then cp build/zarf build/zarf-linux-amd64; fi
 	@ if [ "$(ARCH)" = "arm64" ] && [ ! -s ./build/zarf-arm ]; then $(MAKE) build-cli-linux-arm; fi
 	@ if [ "$(ARCH)" = "arm64" ]; then cp build/zarf-arm build/zarf-linux-arm64; fi
-	docker buildx build --load --platform linux/$(ARCH) --tag ghcr.io/defenseunicorns/zarf/agent:local .
+	docker buildx build --load --platform linux/$(ARCH) --tag ghcr.io/zarf-dev/zarf/agent:local .
 	@ if [ "$(ARCH)" = "amd64" ]; then rm build/zarf-linux-amd64; fi
 	@ if [ "$(ARCH)" = "arm64" ]; then rm build/zarf-linux-arm64; fi
 
diff --git a/src/config/config.go b/src/config/config.go
index f9dfc580ab..203767f6d8 100644
--- a/src/config/config.go
+++ b/src/config/config.go
@@ -17,7 +17,7 @@ import (
 
 // Zarf Global Configuration Constants.
 const (
-	GithubProject = "defenseunicorns/zarf"
+	GithubProject = "zarf-dev/zarf"
 
 	ZarfAgentHost = "agent-hook.zarf.svc"
 
diff --git a/src/pkg/zoci/utils.go b/src/pkg/zoci/utils.go
index e63910a738..bcd5da45d4 100644
--- a/src/pkg/zoci/utils.go
+++ b/src/pkg/zoci/utils.go
@@ -43,5 +43,5 @@ func ReferenceFromMetadata(registryLocation string, metadata *types.ZarfMetadata
 
 // GetInitPackageURL returns the URL for the init package for the given version.
 func GetInitPackageURL(version string) string {
-	return fmt.Sprintf("ghcr.io/defenseunicorns/packages/init:%s", version)
+	return fmt.Sprintf("ghcr.io/zarf-dev/packages/init:%s", version)
 }
diff --git a/src/test/e2e/08_create_differential_test.go b/src/test/e2e/08_create_differential_test.go
index 042ed2e185..ff0a1a698c 100644
--- a/src/test/e2e/08_create_differential_test.go
+++ b/src/test/e2e/08_create_differential_test.go
@@ -73,7 +73,7 @@ func TestCreateDifferential(t *testing.T) {
 	/* Validate we have ONLY the images we expect to have */
 	expectedImages := []string{
 		"ghcr.io/stefanprodan/podinfo:latest",
-		"ghcr.io/defenseunicorns/zarf/agent:v0.26.0",
+		"ghcr.io/zarf-dev/zarf/agent:v0.26.0",
 	}
 	require.Len(t, actualImages, 2, "zarf.yaml from the differential package does not contain the correct number of images")
 	for _, expectedImage := range expectedImages {
diff --git a/src/test/e2e/11_oci_pull_inspect_test.go b/src/test/e2e/11_oci_pull_inspect_test.go
index 47d31232fb..98e5e4ff52 100644
--- a/src/test/e2e/11_oci_pull_inspect_test.go
+++ b/src/test/e2e/11_oci_pull_inspect_test.go
@@ -42,7 +42,7 @@ func (suite *PullInspectTestSuite) Test_0_Pull() {
 	out := fmt.Sprintf("zarf-package-dos-games-%s-1.0.0.tar.zst", e2e.Arch)
 
 	// Build the fully qualified reference.
-	ref := fmt.Sprintf("oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0-%s", e2e.Arch)
+	ref := fmt.Sprintf("oci://ghcr.io/zarf-dev/packages/dos-games:1.0.0-%s", e2e.Arch)
 
 	// Pull the package via OCI.
 	stdOut, stdErr, err := e2e.Zarf("package", "pull", ref)
@@ -74,7 +74,7 @@ func (suite *PullInspectTestSuite) Test_1_Remote_Inspect() {
 
 	// Test inspect on a public package.
 	// NOTE: This also makes sure that Zarf does not attempt auth when inspecting a public package.
-	ref := fmt.Sprintf("oci://ghcr.io/defenseunicorns/packages/dos-games:1.0.0-%s", e2e.Arch)
+	ref := fmt.Sprintf("oci://ghcr.io/zarf-dev/packages/dos-games:1.0.0-%s", e2e.Arch)
 	_, stdErr, err = e2e.Zarf("package", "inspect", ref)
 	suite.NoError(err, stdErr)
 }
diff --git a/src/test/e2e/13_find_images_test.go b/src/test/e2e/13_find_images_test.go
index fbb0185320..27e7bbe715 100644
--- a/src/test/e2e/13_find_images_test.go
+++ b/src/test/e2e/13_find_images_test.go
@@ -53,7 +53,7 @@ func TestFindImages(t *testing.T) {
 
 		stdOut, _, err := e2e.Zarf("prepare", "find-images", ".", "--registry-url", registry, "--create-set", fmt.Sprintf("agent_image_tag=%s", agentTag))
 		require.NoError(t, err)
-		internalRegistryImage := fmt.Sprintf("%s/%s:%s", registry, "defenseunicorns/zarf/agent", agentTag)
+		internalRegistryImage := fmt.Sprintf("%s/%s:%s", registry, "zarf-dev/zarf/agent", agentTag)
 		require.Contains(t, stdOut, internalRegistryImage, "registry image should be found with registry url")
 		require.Contains(t, stdOut, "busybox:latest", "Busybox image should be found as long as helm chart doesn't error")
 
diff --git a/src/test/e2e/14_create_sha_index_test.go b/src/test/e2e/14_create_sha_index_test.go
index 9dee622c85..59993c5874 100644
--- a/src/test/e2e/14_create_sha_index_test.go
+++ b/src/test/e2e/14_create_sha_index_test.go
@@ -21,7 +21,7 @@ func TestCreateIndexShaErrors(t *testing.T) {
 		{
 			name:                  "Image Index",
 			packagePath:           "src/test/packages/14-index-sha/image-index",
-			expectedImageInStderr: "ghcr.io/defenseunicorns/zarf/agent:v0.32.6@sha256:b3fabdc7d4ecd0f396016ef78da19002c39e3ace352ea0ae4baa2ce9d5958376",
+			expectedImageInStderr: "ghcr.io/zarf-dev/zarf/agent:v0.32.6@sha256:b3fabdc7d4ecd0f396016ef78da19002c39e3ace352ea0ae4baa2ce9d5958376",
 		},
 		{
 			name:                  "Manifest List",
diff --git a/src/test/e2e/21_connect_creds_test.go b/src/test/e2e/21_connect_creds_test.go
index 3a929ac596..8a2a1f65ba 100644
--- a/src/test/e2e/21_connect_creds_test.go
+++ b/src/test/e2e/21_connect_creds_test.go
@@ -88,7 +88,7 @@ func connectToZarfServices(ctx context.Context, t *testing.T) {
 	// We assert greater than or equal to since the base init has 8 images
 	// HOWEVER during an upgrade we could have mismatched versions/names resulting in more images
 	require.GreaterOrEqual(t, len(registryList), 3)
-	require.Contains(t, stdOut, "defenseunicorns/zarf/agent")
+	require.Contains(t, stdOut, "zarf-dev/zarf/agent")
 	require.Contains(t, stdOut, "gitea/gitea")
 	require.Contains(t, stdOut, "library/registry")
 
diff --git a/src/test/packages/00-remote-pull-fail/zarf.yaml b/src/test/packages/00-remote-pull-fail/zarf.yaml
index f44d99d4b1..b2212b15d6 100644
--- a/src/test/packages/00-remote-pull-fail/zarf.yaml
+++ b/src/test/packages/00-remote-pull-fail/zarf.yaml
@@ -5,4 +5,4 @@ components:
   - name: doesnotexist-docker
     required: true
     images:
-      - ghcr.io/defenseunicorns/doesnotexist:1.3.3.7
+      - ghcr.io/zarf-dev/doesnotexist:1.3.3.7
diff --git a/src/test/packages/08-differential-package/zarf.yaml b/src/test/packages/08-differential-package/zarf.yaml
index 9d911a66d0..c1e5d4ab71 100644
--- a/src/test/packages/08-differential-package/zarf.yaml
+++ b/src/test/packages/08-differential-package/zarf.yaml
@@ -9,7 +9,7 @@ components:
     required: true
     images:
       - ghcr.io/stefanprodan/podinfo:6.0.0
-      - ghcr.io/defenseunicorns/zarf/agent:###ZARF_PKG_TMPL_PACKAGE_VERSION###
+      - ghcr.io/zarf-dev/zarf/agent:###ZARF_PKG_TMPL_PACKAGE_VERSION###
     repos:
       - https://github.com/defenseunicorns/zarf.git@c74e2e9626da0400e0a41e78319b3054c53a5d4e
       - https://github.com/defenseunicorns/zarf.git@refs/tags/###ZARF_PKG_TMPL_PACKAGE_VERSION###
diff --git a/src/test/packages/14-index-sha/image-index/zarf.yaml b/src/test/packages/14-index-sha/image-index/zarf.yaml
index a29c4380b9..76d3e6ab4f 100644
--- a/src/test/packages/14-index-sha/image-index/zarf.yaml
+++ b/src/test/packages/14-index-sha/image-index/zarf.yaml
@@ -6,4 +6,4 @@ components:
   - name: baseline
     required: true
     images:
-      - ghcr.io/defenseunicorns/zarf/agent:v0.32.6@sha256:05a82656df5466ce17c3e364c16792ae21ce68438bfe06eeab309d0520c16b48
+      - ghcr.io/zarf-dev/zarf/agent:v0.32.6@sha256:05a82656df5466ce17c3e364c16792ae21ce68438bfe06eeab309d0520c16b48
diff --git a/zarf-config.toml b/zarf-config.toml
index eb549dac54..09afb3eed3 100644
--- a/zarf-config.toml
+++ b/zarf-config.toml
@@ -1,7 +1,7 @@
 [package.create.set]
 # The image reference to use for the Zarf agent, defaults to a locally built image
 agent_image_domain = 'ghcr.io/'
-agent_image = 'defenseunicorns/zarf/agent'
+agent_image = 'zarf-dev/zarf/agent'
 agent_image_tag = 'local'
 
 # Tag for the zarf injector binary to use

From a550ac14d2fe9ac1fea86c30c13c01688743b359 Mon Sep 17 00:00:00 2001
From: Austin Abro <37223396+AustinAbro321@users.noreply.github.com>
Date: Fri, 19 Jul 2024 12:24:15 -0400
Subject: [PATCH 3/5] chore: move public test repo (#2739)

Signed-off-by: Austin Abro <austinabro321@gmail.com>
---
 .github/workflows/build-rust-injector.yml            |  1 +
 .github/workflows/dummy-dco.yaml                     | 12 ++++++++++++
 examples/git-data/zarf.yaml                          | 10 +++++-----
 src/pkg/packager/lint/lint_test.go                   |  2 +-
 src/test/e2e/07_create_git_test.go                   | 10 +++++-----
 src/test/e2e/09_component_compose_test.go            |  4 ++--
 src/test/e2e/22_git_and_gitops_test.go               |  4 ++--
 .../09-composable-packages/sub-package/zarf.yaml     |  2 +-
 src/test/packages/09-composable-packages/zarf.yaml   |  2 +-
 src/test/packages/12-lint/zarf.yaml                  |  2 +-
 src/test/packages/22-git-data/zarf.yaml              | 12 +++++-------
 11 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/dummy-dco.yaml

diff --git a/.github/workflows/build-rust-injector.yml b/.github/workflows/build-rust-injector.yml
index 77d939f6f7..eb41af52c7 100644
--- a/.github/workflows/build-rust-injector.yml
+++ b/.github/workflows/build-rust-injector.yml
@@ -2,6 +2,7 @@ name: Zarf Injector Rust Binaries
 
 permissions:
   contents: read
+  id-token: write
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/dummy-dco.yaml b/.github/workflows/dummy-dco.yaml
new file mode 100644
index 0000000000..25f022c804
--- /dev/null
+++ b/.github/workflows/dummy-dco.yaml
@@ -0,0 +1,12 @@
+name: DCO
+on:
+  merge_group:
+
+permissions:
+  contents: read
+
+jobs:
+  DCO:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "dummy DCO workflow (it won't run any check actually) to trigger by merge_group in order to enable merge queue"
diff --git a/examples/git-data/zarf.yaml b/examples/git-data/zarf.yaml
index 01e2c5d4eb..f2294f7c09 100644
--- a/examples/git-data/zarf.yaml
+++ b/examples/git-data/zarf.yaml
@@ -8,30 +8,30 @@ components:
   - name: full-repo
     repos:
       # The following performs a full Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git
+      - https://github.com/zarf-dev/zarf-public-test.git
       # The following performs a full Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test
 
   - name: specific-tag
     repos:
       # The following performs a tag Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@v0.0.1
+      - https://github.com/zarf-dev/zarf-public-test.git@v0.0.1
       # The following performs a refspec tag Git Repo Mirror with `go-git`
-      - https://github.com/defenseunicorns/zarf-public-test.git@refs/tags/v0.0.1
+      - https://github.com/zarf-dev/zarf-public-test.git@refs/tags/v0.0.1
       # The following performs a tag Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@v0.0.1
 
   - name: specific-branch
     repos:
       # The following performs a branch Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
+      - https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
       # The following performs a branch Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@refs/heads/dragons
 
   - name: specific-hash
     repos:
       # The following performs a SHA Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
+      - https://github.com/zarf-dev/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
       # The following performs a SHA Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@01a23218923f24194133b5eb11268cf8d73ff1bb
 
diff --git a/src/pkg/packager/lint/lint_test.go b/src/pkg/packager/lint/lint_test.go
index d20257b23a..67af529a8d 100644
--- a/src/pkg/packager/lint/lint_test.go
+++ b/src/pkg/packager/lint/lint_test.go
@@ -196,7 +196,7 @@ func TestValidateComponent(t *testing.T) {
 
 	t.Run("Unpinnned repo warning", func(t *testing.T) {
 		t.Parallel()
-		unpinnedRepo := "https://github.com/defenseunicorns/zarf-public-test.git"
+		unpinnedRepo := "https://github.com/zarf-dev/zarf-public-test.git"
 		component := types.ZarfComponent{Repos: []string{
 			unpinnedRepo,
 			"https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@v0.0.1",
diff --git a/src/test/e2e/07_create_git_test.go b/src/test/e2e/07_create_git_test.go
index 115558ace9..6c1e3a38c6 100644
--- a/src/test/e2e/07_create_git_test.go
+++ b/src/test/e2e/07_create_git_test.go
@@ -26,7 +26,7 @@ func TestCreateGit(t *testing.T) {
 	defer e2e.CleanFiles(extractDir)
 
 	// Verify the full-repo component
-	gitDir := fmt.Sprintf("%s/components/full-repo/repos/zarf-public-test-1143224168/.git", extractDir)
+	gitDir := fmt.Sprintf("%s/components/full-repo/repos/zarf-public-test-2395699829/.git", extractDir)
 	verifyGitRepo(t, gitDir,
 		"0a6b587", "(HEAD -> main, online-upstream/main)", "Adjust dragon spacing",
 		"v0.0.1\n", "  dragons\n* main\n")
@@ -38,13 +38,13 @@ func TestCreateGit(t *testing.T) {
 		"v0.0.1\n", "  dragons\n* main\n")
 
 	// Verify specific tag component shorthand tag
-	gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-443792367/.git", extractDir)
+	gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-470731282/.git", extractDir)
 	verifyGitRepo(t, gitDir,
 		"5249809", "(HEAD -> zarf-ref-v0.0.1, tag: v0.0.1)", "Added README.md",
 		"v0.0.1\n", "* zarf-ref-v0.0.1\n")
 
 	// Verify specific tag component refspec tag
-	gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-1981411475/.git", extractDir)
+	gitDir = fmt.Sprintf("%s/components/specific-tag/repos/zarf-public-test-482869567/.git", extractDir)
 	verifyGitRepo(t, gitDir,
 		"5249809", "(HEAD -> zarf-ref-v0.0.1, tag: v0.0.1)", "Added README.md",
 		"v0.0.1\n", "* zarf-ref-v0.0.1\n")
@@ -56,7 +56,7 @@ func TestCreateGit(t *testing.T) {
 		"v0.0.1\n", "* zarf-ref-v0.0.1\n")
 
 	// Verify specific branch component
-	gitDir = fmt.Sprintf("%s/components/specific-branch/repos/zarf-public-test-1670574289/.git", extractDir)
+	gitDir = fmt.Sprintf("%s/components/specific-branch/repos/zarf-public-test-2265377406/.git", extractDir)
 	verifyGitRepo(t, gitDir,
 		"01a2321", "(HEAD -> dragons, online-upstream/dragons)", "Explain what this repo does",
 		"", "* dragons\n")
@@ -68,7 +68,7 @@ func TestCreateGit(t *testing.T) {
 		"", "* dragons\n")
 
 	// Verify specific hash component
-	gitDir = fmt.Sprintf("%s/components/specific-hash/repos/zarf-public-test-2357350897/.git", extractDir)
+	gitDir = fmt.Sprintf("%s/components/specific-hash/repos/zarf-public-test-3231174532/.git", extractDir)
 	verifyGitRepo(t, gitDir,
 		"01a2321", "(HEAD -> zarf-ref-01a23218923f24194133b5eb11268cf8d73ff1bb, online-upstream/dragons)", "Explain what this repo does",
 		"v0.0.1\n", "  main\n* zarf-ref-01a23218923f24194133b5eb11268cf8d73ff1bb\n")
diff --git a/src/test/e2e/09_component_compose_test.go b/src/test/e2e/09_component_compose_test.go
index c5edaeb682..176b96207e 100644
--- a/src/test/e2e/09_component_compose_test.go
+++ b/src/test/e2e/09_component_compose_test.go
@@ -139,8 +139,8 @@ func (suite *CompositionSuite) Test_1_FullComposability() {
   - ghcr.io/stefanprodan/podinfo:6.4.0
   - ghcr.io/stefanprodan/podinfo:6.4.1
   repos:
-  - https://github.com/defenseunicorns/zarf-public-test.git
-  - https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
+  - https://github.com/zarf-dev/zarf-public-test.git
+  - https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
 `)
 
 	// Check dataInjections
diff --git a/src/test/e2e/22_git_and_gitops_test.go b/src/test/e2e/22_git_and_gitops_test.go
index 956ded5ed9..572702dbe4 100644
--- a/src/test/e2e/22_git_and_gitops_test.go
+++ b/src/test/e2e/22_git_and_gitops_test.go
@@ -77,7 +77,7 @@ func testGitServerReadOnly(ctx context.Context, t *testing.T, gitURL string) {
 	gitCfg := git.New(zarfState.GitServer)
 
 	// Get the repo as the readonly user
-	repoName := "zarf-public-test-2469062884"
+	repoName := "zarf-public-test-2363058019"
 	getRepoRequest, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/repos/%s/%s", gitURL, zarfState.GitServer.PushUsername, repoName), nil)
 	getRepoResponseBody, _, err := gitCfg.DoHTTPThings(getRepoRequest, types.ZarfGitReadUser, zarfState.GitServer.PullPassword)
 	require.NoError(t, err)
@@ -101,7 +101,7 @@ func testGitServerTagAndHash(ctx context.Context, t *testing.T, gitURL string) {
 	// Init the state variable
 	zarfState, err := c.LoadZarfState(ctx)
 	require.NoError(t, err, "Failed to load Zarf state")
-	repoName := "zarf-public-test-2469062884"
+	repoName := "zarf-public-test-2363058019"
 
 	gitCfg := git.New(zarfState.GitServer)
 
diff --git a/src/test/packages/09-composable-packages/sub-package/zarf.yaml b/src/test/packages/09-composable-packages/sub-package/zarf.yaml
index 20b0a5b323..a749d669fb 100644
--- a/src/test/packages/09-composable-packages/sub-package/zarf.yaml
+++ b/src/test/packages/09-composable-packages/sub-package/zarf.yaml
@@ -26,7 +26,7 @@ components:
     images:
       - ghcr.io/stefanprodan/podinfo:6.4.0
     repos:
-      - https://github.com/defenseunicorns/zarf-public-test.git
+      - https://github.com/zarf-dev/zarf-public-test.git
     files:
       - source: ../files/coffee-ipsum.txt
         target: coffee-ipsum.txt
diff --git a/src/test/packages/09-composable-packages/zarf.yaml b/src/test/packages/09-composable-packages/zarf.yaml
index cf121120e6..6ec2dd49b8 100644
--- a/src/test/packages/09-composable-packages/zarf.yaml
+++ b/src/test/packages/09-composable-packages/zarf.yaml
@@ -40,7 +40,7 @@ components:
     images:
       - ghcr.io/stefanprodan/podinfo:6.4.1
     repos:
-      - https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
+      - https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
     files:
       - source: files/coffee-ipsum.txt
         target: coffee-ipsum.txt
diff --git a/src/test/packages/12-lint/zarf.yaml b/src/test/packages/12-lint/zarf.yaml
index 84f5b53c72..a77e3f89c9 100644
--- a/src/test/packages/12-lint/zarf.yaml
+++ b/src/test/packages/12-lint/zarf.yaml
@@ -14,7 +14,7 @@ components:
 
   - name: full-repo
     repos:
-    - https://github.com/defenseunicorns/zarf-public-test.git
+    - https://github.com/zarf-dev/zarf-public-test.git
     - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@v0.0.1
     - https://gitlab.com/gitlab-org/build/omnibus-mirror/pcre2/-/tree/vreverse?ref_type=heads
     images:
diff --git a/src/test/packages/22-git-data/zarf.yaml b/src/test/packages/22-git-data/zarf.yaml
index 2e3b56d75c..8051918672 100644
--- a/src/test/packages/22-git-data/zarf.yaml
+++ b/src/test/packages/22-git-data/zarf.yaml
@@ -9,19 +9,17 @@ components:
     required: true
     repos:
       # Do a full Git Repo Mirror
-      - https://github.com/defenseunicorns/zarf-public-test.git
+      - https://github.com/zarf-dev/zarf-public-test.git
       # The following performs a full Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test
-      # Perform a full repo mirror of a simple repository with a single branch - (this causes an "already up to date" error in go-git)
-      - https://github.com/defenseunicorns/golang-tekton-hello-world.git
 
   - name: specific-tag
     required: true
     repos:
       # The following performs a tag Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@v0.0.1
+      - https://github.com/zarf-dev/zarf-public-test.git@v0.0.1
       # The following performs a refspec tag Git Repo Mirror with `go-git`
-      - https://github.com/defenseunicorns/zarf-public-test.git@refs/tags/v0.0.1
+      - https://github.com/zarf-dev/zarf-public-test.git@refs/tags/v0.0.1
       # The following performs a tag Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@v0.0.1
     actions:
@@ -36,7 +34,7 @@ components:
     required: true
     repos:
       # The following performs a branch Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@refs/heads/dragons
+      - https://github.com/zarf-dev/zarf-public-test.git@refs/heads/dragons
       # The following performs a branch Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@refs/heads/dragons
     actions:
@@ -51,7 +49,7 @@ components:
     required: true
     repos:
       # The following performs a SHA Git Repo Mirror with `go-git` (internal to Zarf)
-      - https://github.com/defenseunicorns/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
+      - https://github.com/zarf-dev/zarf-public-test.git@01a23218923f24194133b5eb11268cf8d73ff1bb
       # The following performs a SHA Git Repo Mirror forcing a fallback to host `git`
       - https://dev.azure.com/defenseunicorns/zarf-public-test/_git/zarf-public-test@01a23218923f24194133b5eb11268cf8d73ff1bb
     actions:

From 0a5d54c883ca48e1dea441b0071a2368d13d63e7 Mon Sep 17 00:00:00 2001
From: schristoff-du <167717759+schristoff-du@users.noreply.github.com>
Date: Fri, 19 Jul 2024 12:51:48 -0400
Subject: [PATCH 4/5] fix: update README.md (#2729)

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 221ac84ae0..88385564ce 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 [![Latest Release](https://img.shields.io/github/v/release/defenseunicorns/zarf)](https://github.com/defenseunicorns/zarf/releases)
 [![Go version](https://img.shields.io/github/go-mod/go-version/defenseunicorns/zarf?filename=go.mod)](https://go.dev/)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/defenseunicorns/zarf/release.yml)](https://github.com/defenseunicorns/zarf/actions/workflows/release.yml)
-[![Zarf Documentation Status](https://api.netlify.com/api/v1/badges/fe846ae4-25fb-4274-9968-90782640ee9f/deploy-status)](https://app.netlify.com/sites/zarf-docs/deploys)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/defenseunicorns/zarf/badge)](https://securityscorecards.dev/viewer/?uri=github.com/defenseunicorns/zarf)
 
 <img align="right" alt="zarf logo" src="site/src/assets/zarf-logo.png"  height="256" />

From 4bd52447194a771d38f6694027d90b6ee8c4aa2b Mon Sep 17 00:00:00 2001
From: Xander Grzywinski <xandergrzyw@gmail.com>
Date: Fri, 19 Jul 2024 13:23:57 -0400
Subject: [PATCH 5/5] docs: update to openssf code of conduct (#2734)

Signed-off-by: Xander Grzywinski <xandergrzyw@gmail.com>
Co-authored-by: schristoff <28318173+schristoff@users.noreply.github.com>
---
 CODE_OF_CONDUCT.md | 133 +--------------------------------------------
 README.md          |   1 -
 2 files changed, 1 insertion(+), 133 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index a7d8c48f7e..6dd1456839 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,132 +1 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-zarf-dev-private@googlegroups.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
\ No newline at end of file
+Community members are required to abide by the [OpenSSF Code of Conduct](https://openssf.org/community/code-of-conduct/) in all project spaces including (but not limited to) GitHub, Slack, social media, and conferences.
\ No newline at end of file
diff --git a/README.md b/README.md
index 88385564ce..e51160774f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@
 [![Zarf Documentation](https://img.shields.io/badge/docs-docs.zarf.dev-775ba1)](https://docs.zarf.dev/)
 [![Zarf Slack Channel](https://img.shields.io/badge/k8s%20slack-zarf-40a3dd)](https://kubernetes.slack.com/archives/C03B6BJAUJ3)
 [![Community Meetups](https://img.shields.io/badge/community-meetups-22aebb)](https://github.com/defenseunicorns/zarf/issues/2202)
-[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md)
 
 Zarf eliminates the [complexity of air gap software delivery](https://www.itopstimes.com/contain/air-gap-kubernetes-considerations-for-running-cloud-native-applications-without-the-cloud/) for Kubernetes clusters and cloud-native workloads using a declarative packaging strategy to support DevSecOps in offline and semi-connected environments.