From 514d1908d9445078e04d790416d423f87c8139e3 Mon Sep 17 00:00:00 2001
From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
Date: Wed, 6 Nov 2024 11:47:33 +1100
Subject: [PATCH 1/3] Git repository location changes.

---
 MAINTAINERS.md                                |  8 ++---
 README.md                                     |  4 +--
 assets-server/go.mod                          |  2 +-
 client-programs/cmd/educates/main.go          |  6 ++--
 client-programs/go.mod                        |  2 +-
 client-programs/pkg/cluster/kindcluster.go    |  4 +--
 .../pkg/cmd/admin_diagnostics_collect_cmd.go  |  4 +--
 .../pkg/cmd/admin_lookup_kubeconfig_cmd.go    |  2 +-
 .../pkg/cmd/admin_platform_config_cmd.go      |  4 +--
 .../pkg/cmd/admin_platform_delete_cmd.go      |  6 ++--
 .../pkg/cmd/admin_platform_deploy_cmd.go      |  8 ++---
 .../pkg/cmd/admin_platform_values_cmd.go      |  4 +--
 .../pkg/cmd/cluster_portal_create_cmd.go      |  2 +-
 .../pkg/cmd/cluster_portal_delete_cmd.go      |  2 +-
 .../pkg/cmd/cluster_portal_list_cmd.go        |  2 +-
 .../pkg/cmd/cluster_portal_open_cmd.go        |  2 +-
 .../pkg/cmd/cluster_portal_password_cmd.go    |  2 +-
 .../pkg/cmd/cluster_session_extend_cmd.go     |  4 +--
 .../pkg/cmd/cluster_session_list_cmd.go       |  2 +-
 .../pkg/cmd/cluster_session_status_cmd.go     |  4 +--
 .../pkg/cmd/cluster_session_terminate_cmd.go  |  4 +--
 .../pkg/cmd/cluster_workshop_delete_cmd.go    |  2 +-
 .../pkg/cmd/cluster_workshop_deploy_cmd.go    |  2 +-
 .../pkg/cmd/cluster_workshop_list_cmd.go      |  2 +-
 .../pkg/cmd/cluster_workshop_request_cmd.go   |  4 +--
 .../pkg/cmd/cluster_workshop_serve_cmd.go     |  6 ++--
 .../pkg/cmd/cluster_workshop_update_cmd.go    |  2 +-
 .../pkg/cmd/docker_workshop_delete_cmd.go     |  2 +-
 .../pkg/cmd/docker_workshop_deploy_cmd.go     |  2 +-
 .../pkg/cmd/local_cluster_create_cmd.go       | 10 +++---
 .../pkg/cmd/local_cluster_delete_cmd.go       |  6 ++--
 .../pkg/cmd/local_cluster_start_cmd.go        |  2 +-
 .../pkg/cmd/local_cluster_status_cmd.go       |  2 +-
 .../pkg/cmd/local_cluster_stop_cmd.go         |  2 +-
 .../pkg/cmd/local_config_edit_cmd.go          |  4 +--
 .../pkg/cmd/local_config_reset_cmd.go         |  2 +-
 .../pkg/cmd/local_config_view_cmd.go          |  2 +-
 .../pkg/cmd/local_registry_delete_cmd.go      |  2 +-
 .../pkg/cmd/local_registry_deploy_cmd.go      |  4 +--
 .../pkg/cmd/local_registry_prune_cmd.go       |  2 +-
 .../pkg/cmd/local_resolver_delete_cmd.go      |  2 +-
 .../pkg/cmd/local_resolver_deploy_cmd.go      |  4 +--
 .../pkg/cmd/local_secrets_add_cmd.go          |  2 +-
 .../pkg/cmd/local_secrets_export_cmd.go       |  2 +-
 .../pkg/cmd/local_secrets_import_cmd.go       |  2 +-
 .../pkg/cmd/local_secrets_list_cmd.go         |  2 +-
 .../pkg/cmd/local_secrets_remove_cmd.go       |  2 +-
 .../pkg/cmd/local_secrets_sync_cmd.go         |  4 +--
 client-programs/pkg/cmd/template_list_cmd.go  |  2 +-
 client-programs/pkg/cmd/workshop_new_cmd.go   |  2 +-
 .../pkg/config/installationconfig.go          |  4 +--
 .../pkg/diagnostics/diagnostics.go            |  2 +-
 client-programs/pkg/diagnostics/fetcher.go    |  4 +--
 .../pkg/educatesrestapi/catalog.go            |  2 +-
 client-programs/pkg/installer/installer.go    |  8 ++---
 .../pkg/installer/kappDepsFactory.go          |  2 +-
 client-programs/pkg/renderer/hugo.go          |  2 +-
 client-programs/pkg/resolver/resolver.go      |  4 +--
 client-programs/pkg/secrets/secrets.go        |  2 +-
 developer-docs/README.md                      |  4 +--
 developer-docs/project-roadmap.md             |  2 +-
 developer-docs/release-procedures.md          |  4 +--
 docker-extension/Dockerfile                   |  6 ++--
 docker-extension/README.md                    | 14 ++++----
 .../BottomIntroPane/BottomIntroPane.tsx       |  4 +--
 go.work.sum                                   | 36 +++++++++++++++++++
 package-repository/.imgpkg/bundle.yml         |  6 ++--
 .../installer.educates.dev/metadata.yaml      |  2 +-
 .../custom-resources/training-portal.md       |  2 +-
 .../custom-resources/workshop-definition.md   | 18 +++++-----
 .../custom-resources/workshop-environment.md  |  2 +-
 .../custom-resources/workshop-session.md      |  2 +-
 .../getting-started/quick-start-guide.md      | 16 ++++-----
 .../getting-started/workshop-templates.md     |  6 ++--
 .../carvel-based-installation.md              |  8 ++---
 .../project-details/project-overview.md       |  6 ++--
 .../project-details/project-roadmap.md        |  2 +-
 .../workshop-content/building-an-image.md     | 28 +++++++--------
 .../workshop-content/working-on-content.md    | 10 +++---
 .../workshop-configuration.md                 |  6 ++--
 .../base-environment/opt/gateway/package.json |  2 +-
 .../base-environment/opt/helper/package.json  |  2 +-
 .../opt/renderer/package.json                 |  2 +-
 83 files changed, 207 insertions(+), 175 deletions(-)

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 0ae6ceafb..aa07355a6 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,6 +1,6 @@
 # Current Educates Maintainers
 
-| Maintainer       | GitHub ID                                             | Affiliation                              |
-|------------------|-------------------------------------------------------|------------------------------------------|
-| Graham Dumpleton | [GrahamDumpleton](https://github.com/GrahamDumpleton) | [VMware](https://www.github.com/vmware/) |
-| Jorge Morales    | [jorgemoralespou](https://github.com/jorgemoralespou) | [VMware](https://www.github.com/vmware/) |
+| Maintainer       | GitHub ID                                             |
+|------------------|-------------------------------------------------------|
+| Graham Dumpleton | [GrahamDumpleton](https://github.com/GrahamDumpleton) |
+| Jorge Morales    | [jorgemoralespou](https://github.com/jorgemoralespou) |
diff --git a/README.md b/README.md
index acea477fd..aaefd86f4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![Netlify Status](https://api.netlify.com/api/v1/badges/733ffbee-a738-432b-963c-5ef65ff16302/deploy-status)](https://app.netlify.com/sites/educates-docs/deploys)
-
 Educates Training Platform
 ==========================
 
@@ -23,7 +21,7 @@ the [Kubernetes community Slack](https://kubernetes.slack.com/).
 
 If you have found a bug in Educates or want to request a feature, you can use
 our [GitHub issue
-tracker](https://github.com/vmware-tanzu-labs/educates-training-platform/issues).
+tracker](https://github.com/educates/educates-training-platform/issues).
 
 Contributing to Educates
 ------------------------
diff --git a/assets-server/go.mod b/assets-server/go.mod
index ccaa044f5..ba1b0c6ca 100644
--- a/assets-server/go.mod
+++ b/assets-server/go.mod
@@ -1,4 +1,4 @@
-module github.com/vmware-tanzu-labs/educates-training-platform/assets-server
+module github.com/educates/educates-training-platform/assets-server
 
 go 1.20
 
diff --git a/client-programs/cmd/educates/main.go b/client-programs/cmd/educates/main.go
index 1a1f91b02..dbd812e59 100644
--- a/client-programs/cmd/educates/main.go
+++ b/client-programs/cmd/educates/main.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/educates/educates-training-platform/client-programs/pkg/cmd"
+	"github.com/educates/educates-training-platform/client-programs/pkg/logger"
 	"github.com/go-logr/logr"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cmd"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/logger"
 	"k8s.io/klog/v2"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -18,7 +18,7 @@ import (
 // with the actual version at build time when making a release.
 
 var projectVersion string = "develop"
-var imageRepository string = "ghcr.io/vmware-tanzu-labs"
+var imageRepository string = "ghcr.io/educates"
 
 // Main entrypoint for execution of Educates CLI.
 
diff --git a/client-programs/go.mod b/client-programs/go.mod
index 2b5d2c008..d83a32de9 100644
--- a/client-programs/go.mod
+++ b/client-programs/go.mod
@@ -1,4 +1,4 @@
-module github.com/vmware-tanzu-labs/educates-training-platform/client-programs
+module github.com/educates/educates-training-platform/client-programs
 
 go 1.22.5
 
diff --git a/client-programs/pkg/cluster/kindcluster.go b/client-programs/pkg/cluster/kindcluster.go
index 332aaf2f8..c40114959 100644
--- a/client-programs/pkg/cluster/kindcluster.go
+++ b/client-programs/pkg/cluster/kindcluster.go
@@ -18,8 +18,8 @@ import (
 	"sigs.k8s.io/kind/pkg/cluster"
 	"sigs.k8s.io/kind/pkg/cmd"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 type KindClusterConfig struct {
diff --git a/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go b/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go
index 1d78f4b7e..98f202175 100644
--- a/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go
+++ b/client-programs/pkg/cmd/admin_diagnostics_collect_cmd.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/diagnostics"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/diagnostics"
 )
 
 type AdminDiagnosticsCollectOptions struct {
diff --git a/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go b/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go
index 29a4dc69b..3f9c5eace 100644
--- a/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go
+++ b/client-programs/pkg/cmd/admin_lookup_kubeconfig_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go
index 448392816..71e07c4de 100644
--- a/client-programs/pkg/cmd/admin_platform_config_cmd.go
+++ b/client-programs/pkg/cmd/admin_platform_config_cmd.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/installer"
 )
 
 var (
diff --git a/client-programs/pkg/cmd/admin_platform_delete_cmd.go b/client-programs/pkg/cmd/admin_platform_delete_cmd.go
index 6d992e5c3..6dfdb03a3 100644
--- a/client-programs/pkg/cmd/admin_platform_delete_cmd.go
+++ b/client-programs/pkg/cmd/admin_platform_delete_cmd.go
@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/installer"
 )
 
 type PlatformDeleteOptions struct {
diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go
index a573b2d5d..51d4bf15f 100644
--- a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go
+++ b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go
@@ -6,10 +6,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/installer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/secrets"
 )
 
 var (
diff --git a/client-programs/pkg/cmd/admin_platform_values_cmd.go b/client-programs/pkg/cmd/admin_platform_values_cmd.go
index 45559e2fc..95f57bde5 100644
--- a/client-programs/pkg/cmd/admin_platform_values_cmd.go
+++ b/client-programs/pkg/cmd/admin_platform_values_cmd.go
@@ -6,8 +6,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/installer"
 )
 
 var (
diff --git a/client-programs/pkg/cmd/cluster_portal_create_cmd.go b/client-programs/pkg/cmd/cluster_portal_create_cmd.go
index 9494ceb28..94a43e0a8 100644
--- a/client-programs/pkg/cmd/cluster_portal_create_cmd.go
+++ b/client-programs/pkg/cmd/cluster_portal_create_cmd.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_portal_delete_cmd.go b/client-programs/pkg/cmd/cluster_portal_delete_cmd.go
index fd7f70b76..dc94d06cb 100644
--- a/client-programs/pkg/cmd/cluster_portal_delete_cmd.go
+++ b/client-programs/pkg/cmd/cluster_portal_delete_cmd.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/client-programs/pkg/cmd/cluster_portal_list_cmd.go b/client-programs/pkg/cmd/cluster_portal_list_cmd.go
index 872dc45ee..70d777e82 100644
--- a/client-programs/pkg/cmd/cluster_portal_list_cmd.go
+++ b/client-programs/pkg/cmd/cluster_portal_list_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_portal_open_cmd.go b/client-programs/pkg/cmd/cluster_portal_open_cmd.go
index a34033a6a..82b0321c0 100644
--- a/client-programs/pkg/cmd/cluster_portal_open_cmd.go
+++ b/client-programs/pkg/cmd/cluster_portal_open_cmd.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_portal_password_cmd.go b/client-programs/pkg/cmd/cluster_portal_password_cmd.go
index 142ebb0b1..964627957 100644
--- a/client-programs/pkg/cmd/cluster_portal_password_cmd.go
+++ b/client-programs/pkg/cmd/cluster_portal_password_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_session_extend_cmd.go b/client-programs/pkg/cmd/cluster_session_extend_cmd.go
index 337cac675..921d6da84 100644
--- a/client-programs/pkg/cmd/cluster_session_extend_cmd.go
+++ b/client-programs/pkg/cmd/cluster_session_extend_cmd.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi"
 )
 
 type ClusterSessionExtendOptions struct {
diff --git a/client-programs/pkg/cmd/cluster_session_list_cmd.go b/client-programs/pkg/cmd/cluster_session_list_cmd.go
index e6bf8d86f..d34831446 100644
--- a/client-programs/pkg/cmd/cluster_session_list_cmd.go
+++ b/client-programs/pkg/cmd/cluster_session_list_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_session_status_cmd.go b/client-programs/pkg/cmd/cluster_session_status_cmd.go
index b5a2d8a4d..29d00cd5b 100644
--- a/client-programs/pkg/cmd/cluster_session_status_cmd.go
+++ b/client-programs/pkg/cmd/cluster_session_status_cmd.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi"
 )
 
 type ClusterSessionStatusOptions struct {
diff --git a/client-programs/pkg/cmd/cluster_session_terminate_cmd.go b/client-programs/pkg/cmd/cluster_session_terminate_cmd.go
index 7c47a8239..cb07e6fe1 100644
--- a/client-programs/pkg/cmd/cluster_session_terminate_cmd.go
+++ b/client-programs/pkg/cmd/cluster_session_terminate_cmd.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi"
 )
 
 type ClusterSessionTerminateOptions struct {
diff --git a/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go b/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go
index ad14e6f3a..e2826ce27 100644
--- a/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_delete_cmd.go
@@ -6,7 +6,7 @@ import (
 	yttcmd "carvel.dev/ytt/pkg/cmd/template"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go b/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go
index 9c34f44c0..20ccb1dbe 100644
--- a/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_deploy_cmd.go
@@ -17,7 +17,7 @@ import (
 	yttcmd "carvel.dev/ytt/pkg/cmd/template"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_workshop_list_cmd.go b/client-programs/pkg/cmd/cluster_workshop_list_cmd.go
index 85c3697df..ef27bc482 100644
--- a/client-programs/pkg/cmd/cluster_workshop_list_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_list_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_workshop_request_cmd.go b/client-programs/pkg/cmd/cluster_workshop_request_cmd.go
index 1cea635b7..38efb9d1a 100644
--- a/client-programs/pkg/cmd/cluster_workshop_request_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_request_cmd.go
@@ -12,8 +12,8 @@ import (
 	"github.com/joho/godotenv"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go b/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go
index 4d1c19a94..5bfdf020c 100644
--- a/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_serve_cmd.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/renderer"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/renderer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func calculateWorkshopRoot(path string) (string, error) {
diff --git a/client-programs/pkg/cmd/cluster_workshop_update_cmd.go b/client-programs/pkg/cmd/cluster_workshop_update_cmd.go
index 275bc27d4..cf6abf34d 100644
--- a/client-programs/pkg/cmd/cluster_workshop_update_cmd.go
+++ b/client-programs/pkg/cmd/cluster_workshop_update_cmd.go
@@ -13,7 +13,7 @@ import (
 	yttcmd "carvel.dev/ytt/pkg/cmd/template"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/client-programs/pkg/cmd/docker_workshop_delete_cmd.go b/client-programs/pkg/cmd/docker_workshop_delete_cmd.go
index 525eea383..068072b9b 100644
--- a/client-programs/pkg/cmd/docker_workshop_delete_cmd.go
+++ b/client-programs/pkg/cmd/docker_workshop_delete_cmd.go
@@ -12,7 +12,7 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go b/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go
index fdbcd6149..8323a15ba 100644
--- a/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go
+++ b/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go
@@ -21,7 +21,7 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	"golang.org/x/exp/slices"
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/cmd/local_cluster_create_cmd.go b/client-programs/pkg/cmd/local_cluster_create_cmd.go
index f788f1b28..5b78ab8ff 100644
--- a/client-programs/pkg/cmd/local_cluster_create_cmd.go
+++ b/client-programs/pkg/cmd/local_cluster_create_cmd.go
@@ -14,11 +14,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/installer"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/installer"
+	"github.com/educates/educates-training-platform/client-programs/pkg/registry"
+	"github.com/educates/educates-training-platform/client-programs/pkg/secrets"
 )
 
 var (
diff --git a/client-programs/pkg/cmd/local_cluster_delete_cmd.go b/client-programs/pkg/cmd/local_cluster_delete_cmd.go
index 638840c41..afae80c12 100644
--- a/client-programs/pkg/cmd/local_cluster_delete_cmd.go
+++ b/client-programs/pkg/cmd/local_cluster_delete_cmd.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/registry"
+	"github.com/educates/educates-training-platform/client-programs/pkg/resolver"
 )
 
 type LocalClusterDeleteOptions struct {
diff --git a/client-programs/pkg/cmd/local_cluster_start_cmd.go b/client-programs/pkg/cmd/local_cluster_start_cmd.go
index fc605ec1a..c7f7a2ac6 100644
--- a/client-programs/pkg/cmd/local_cluster_start_cmd.go
+++ b/client-programs/pkg/cmd/local_cluster_start_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 )
 
 func (p *ProjectInfo) NewLocalClusterStartCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_cluster_status_cmd.go b/client-programs/pkg/cmd/local_cluster_status_cmd.go
index 70d15c5de..912edec6a 100644
--- a/client-programs/pkg/cmd/local_cluster_status_cmd.go
+++ b/client-programs/pkg/cmd/local_cluster_status_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 )
 
 func (p *ProjectInfo) NewLocalClusterStatusCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_cluster_stop_cmd.go b/client-programs/pkg/cmd/local_cluster_stop_cmd.go
index 9d7d0ff19..c7685dc0b 100644
--- a/client-programs/pkg/cmd/local_cluster_stop_cmd.go
+++ b/client-programs/pkg/cmd/local_cluster_stop_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 )
 
 func (p *ProjectInfo) NewLocalClusterStopCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_config_edit_cmd.go b/client-programs/pkg/cmd/local_config_edit_cmd.go
index 2cf8ce5fe..2b76ce1b6 100644
--- a/client-programs/pkg/cmd/local_config_edit_cmd.go
+++ b/client-programs/pkg/cmd/local_config_edit_cmd.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func (p *ProjectInfo) NewLocalConfigEditCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_config_reset_cmd.go b/client-programs/pkg/cmd/local_config_reset_cmd.go
index 05a7d801a..450b5ef8e 100644
--- a/client-programs/pkg/cmd/local_config_reset_cmd.go
+++ b/client-programs/pkg/cmd/local_config_reset_cmd.go
@@ -5,7 +5,7 @@ import (
 	"path"
 
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func (p *ProjectInfo) NewLocalConfigResetCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_config_view_cmd.go b/client-programs/pkg/cmd/local_config_view_cmd.go
index ab062c781..cbdb22240 100644
--- a/client-programs/pkg/cmd/local_config_view_cmd.go
+++ b/client-programs/pkg/cmd/local_config_view_cmd.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/client-programs/pkg/cmd/local_registry_delete_cmd.go b/client-programs/pkg/cmd/local_registry_delete_cmd.go
index 93411a63e..36f7e04c2 100644
--- a/client-programs/pkg/cmd/local_registry_delete_cmd.go
+++ b/client-programs/pkg/cmd/local_registry_delete_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
+	"github.com/educates/educates-training-platform/client-programs/pkg/registry"
 )
 
 func (p *ProjectInfo) NewLocalRegistryDeleteCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_registry_deploy_cmd.go b/client-programs/pkg/cmd/local_registry_deploy_cmd.go
index 8af32ecea..d49f7c095 100644
--- a/client-programs/pkg/cmd/local_registry_deploy_cmd.go
+++ b/client-programs/pkg/cmd/local_registry_deploy_cmd.go
@@ -6,8 +6,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/registry"
 )
 
 type LocalRegistryDeployOptions struct {
diff --git a/client-programs/pkg/cmd/local_registry_prune_cmd.go b/client-programs/pkg/cmd/local_registry_prune_cmd.go
index b152916bc..3becc460c 100644
--- a/client-programs/pkg/cmd/local_registry_prune_cmd.go
+++ b/client-programs/pkg/cmd/local_registry_prune_cmd.go
@@ -4,7 +4,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
+	"github.com/educates/educates-training-platform/client-programs/pkg/registry"
 )
 
 type LocalRegistryPruneOptions struct {
diff --git a/client-programs/pkg/cmd/local_resolver_delete_cmd.go b/client-programs/pkg/cmd/local_resolver_delete_cmd.go
index 0d5393009..ac00c1d37 100644
--- a/client-programs/pkg/cmd/local_resolver_delete_cmd.go
+++ b/client-programs/pkg/cmd/local_resolver_delete_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver"
+	"github.com/educates/educates-training-platform/client-programs/pkg/resolver"
 )
 
 func (p *ProjectInfo) NewLocalResolverDeleteCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_resolver_deploy_cmd.go b/client-programs/pkg/cmd/local_resolver_deploy_cmd.go
index f3812137a..aaf643e7b 100644
--- a/client-programs/pkg/cmd/local_resolver_deploy_cmd.go
+++ b/client-programs/pkg/cmd/local_resolver_deploy_cmd.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/resolver"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/resolver"
 )
 
 type LocalResolverDeployOptions struct {
diff --git a/client-programs/pkg/cmd/local_secrets_add_cmd.go b/client-programs/pkg/cmd/local_secrets_add_cmd.go
index 59b1019d4..eadd56184 100644
--- a/client-programs/pkg/cmd/local_secrets_add_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_add_cmd.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/util/templates"
diff --git a/client-programs/pkg/cmd/local_secrets_export_cmd.go b/client-programs/pkg/cmd/local_secrets_export_cmd.go
index 4694295c1..a6f237265 100644
--- a/client-programs/pkg/cmd/local_secrets_export_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_export_cmd.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func (p *ProjectInfo) NewLocalSecretsExportCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_secrets_import_cmd.go b/client-programs/pkg/cmd/local_secrets_import_cmd.go
index 68c67ad18..e42a0d4b6 100644
--- a/client-programs/pkg/cmd/local_secrets_import_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_import_cmd.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
diff --git a/client-programs/pkg/cmd/local_secrets_list_cmd.go b/client-programs/pkg/cmd/local_secrets_list_cmd.go
index 0cf9b4ebd..f910ebe25 100644
--- a/client-programs/pkg/cmd/local_secrets_list_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_list_cmd.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func (p *ProjectInfo) NewLocalSecretsListCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_secrets_remove_cmd.go b/client-programs/pkg/cmd/local_secrets_remove_cmd.go
index dfff72c64..b0953eed8 100644
--- a/client-programs/pkg/cmd/local_secrets_remove_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_remove_cmd.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 func (p *ProjectInfo) NewLocalSecretsRemoveCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/local_secrets_sync_cmd.go b/client-programs/pkg/cmd/local_secrets_sync_cmd.go
index 09a332c06..2151e0fcf 100644
--- a/client-programs/pkg/cmd/local_secrets_sync_cmd.go
+++ b/client-programs/pkg/cmd/local_secrets_sync_cmd.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/secrets"
 )
 
 type LocalSecretsSyncOptions struct {
diff --git a/client-programs/pkg/cmd/template_list_cmd.go b/client-programs/pkg/cmd/template_list_cmd.go
index e19ff2cef..906916b49 100644
--- a/client-programs/pkg/cmd/template_list_cmd.go
+++ b/client-programs/pkg/cmd/template_list_cmd.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/templates"
+	"github.com/educates/educates-training-platform/client-programs/pkg/templates"
 )
 
 func (p *ProjectInfo) NewTemplateListCmd() *cobra.Command {
diff --git a/client-programs/pkg/cmd/workshop_new_cmd.go b/client-programs/pkg/cmd/workshop_new_cmd.go
index 0f3d68b54..bb8e52238 100644
--- a/client-programs/pkg/cmd/workshop_new_cmd.go
+++ b/client-programs/pkg/cmd/workshop_new_cmd.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/templates"
+	"github.com/educates/educates-training-platform/client-programs/pkg/templates"
 )
 
 type WorkshopNewOptions struct {
diff --git a/client-programs/pkg/config/installationconfig.go b/client-programs/pkg/config/installationconfig.go
index fc66b4cac..d94614d86 100644
--- a/client-programs/pkg/config/installationconfig.go
+++ b/client-programs/pkg/config/installationconfig.go
@@ -5,8 +5,8 @@ import (
 	"path"
 
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/secrets"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/secrets"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/client-programs/pkg/diagnostics/diagnostics.go b/client-programs/pkg/diagnostics/diagnostics.go
index 4d533be85..b17d3fe4d 100644
--- a/client-programs/pkg/diagnostics/diagnostics.go
+++ b/client-programs/pkg/diagnostics/diagnostics.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 )
 
 type ClusterDiagnostics struct {
diff --git a/client-programs/pkg/diagnostics/fetcher.go b/client-programs/pkg/diagnostics/fetcher.go
index 76b766f53..11c424577 100644
--- a/client-programs/pkg/diagnostics/fetcher.go
+++ b/client-programs/pkg/diagnostics/fetcher.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/educatesrestapi"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/educatesrestapi"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/educatesrestapi/catalog.go b/client-programs/pkg/educatesrestapi/catalog.go
index 3686649e3..745b3bd85 100644
--- a/client-programs/pkg/educatesrestapi/catalog.go
+++ b/client-programs/pkg/educatesrestapi/catalog.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/client-programs/pkg/installer/installer.go b/client-programs/pkg/installer/installer.go
index 9dd89688d..0a36071fe 100644
--- a/client-programs/pkg/installer/installer.go
+++ b/client-programs/pkg/installer/installer.go
@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/logger"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/logger"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 
 	"github.com/cppforlife/go-cli-ui/ui"
 	"github.com/pkg/errors"
diff --git a/client-programs/pkg/installer/kappDepsFactory.go b/client-programs/pkg/installer/kappDepsFactory.go
index be40b0cab..034a15244 100644
--- a/client-programs/pkg/installer/kappDepsFactory.go
+++ b/client-programs/pkg/installer/kappDepsFactory.go
@@ -2,7 +2,7 @@ package installer
 
 import (
 	core "carvel.dev/kapp/pkg/kapp/cmd/core"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
diff --git a/client-programs/pkg/renderer/hugo.go b/client-programs/pkg/renderer/hugo.go
index 9c60a6535..f3b65d5bb 100644
--- a/client-programs/pkg/renderer/hugo.go
+++ b/client-programs/pkg/renderer/hugo.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/cluster"
+	"github.com/educates/educates-training-platform/client-programs/pkg/cluster"
 	"gopkg.in/yaml.v2"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/client-programs/pkg/resolver/resolver.go b/client-programs/pkg/resolver/resolver.go
index 78dab651b..ef8e42516 100644
--- a/client-programs/pkg/resolver/resolver.go
+++ b/client-programs/pkg/resolver/resolver.go
@@ -15,8 +15,8 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/config"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/config"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 )
 
 const dnsmasqConfigTemplateData = `
diff --git a/client-programs/pkg/secrets/secrets.go b/client-programs/pkg/secrets/secrets.go
index c9bba736d..568091f6d 100644
--- a/client-programs/pkg/secrets/secrets.go
+++ b/client-programs/pkg/secrets/secrets.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/utils"
+	"github.com/educates/educates-training-platform/client-programs/pkg/utils"
 	apiv1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/developer-docs/README.md b/developer-docs/README.md
index 7f1ab9b88..4d23da45e 100644
--- a/developer-docs/README.md
+++ b/developer-docs/README.md
@@ -3,8 +3,8 @@ Developer Documentation
 
 The Educates project consists of the following Git repositories:
 
-* Educates Training Platform - https://github.com/vmware-tanzu-labs/educates-training-platform
-* Educates GitHub Actions - https://github.com/vmware-tanzu-labs/educates-github-actions
+* Educates Training Platform - https://github.com/educates/educates-training-platform
+* Educates GitHub Actions - https://github.com/educates/educates-github-actions
 
 The Educates Training Platform repository (this repository), holds all source code for building and making releases of the core platform, as well as documentation.
 
diff --git a/developer-docs/project-roadmap.md b/developer-docs/project-roadmap.md
index dbdc0f927..e67e5e41c 100644
--- a/developer-docs/project-roadmap.md
+++ b/developer-docs/project-roadmap.md
@@ -1,7 +1,7 @@
 Project Roadmap
 ===============
 
-The Educates project uses a GitHub [project board](https://github.com/orgs/vmware-tanzu-labs/projects/13) to track issues and feature requests. For more substantial pie-in-the-sky goals, these are outlined below. Because something is listed here doesn't mean that it will actually be done. The list is just intended to capture ideas for larger changes or new features we think would be worthwhile doing at some point so you can see where the project may be heading.
+The Educates project uses a GitHub [project board](https://github.com/orgs/educates/projects/1) to track issues and feature requests. For more substantial pie-in-the-sky goals, these are outlined below. Because something is listed here doesn't mean that it will actually be done. The list is just intended to capture ideas for larger changes or new features we think would be worthwhile doing at some point so you can see where the project may be heading.
 
 Simplified course deployment
 ----------------------------
diff --git a/developer-docs/release-procedures.md b/developer-docs/release-procedures.md
index a1e9515ad..a519fbd87 100644
--- a/developer-docs/release-procedures.md
+++ b/developer-docs/release-procedures.md
@@ -19,7 +19,7 @@ Triggering a Development Build
 
 For any individual code changes the developer of the changes should have already built and tested the changes on their local system. If a complete build of Educates consisting of all code changes for a release is required, a build from the `develop` branch can be triggered using a GitHub actions workflow dispatch trigger event. This can be done from the GitHub actions page of the main Educates GitHub repository located at:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/actions](https://github.com/vmware-tanzu-labs/educates-training-platform/actions)
+* [https://github.com/educates/educates-training-platform/actions](https://github.com/educates/educates-training-platform/actions)
 
 ![](github-actions-build.png)
 
@@ -30,7 +30,7 @@ By default the build will only be run for the `linux/amd64` platform. The `linux
 Being a development build, all the container images, client programs and package bundles will be created, but neither a package repository bundle or GitHub release will be created. To test the release, clients programs and package resource manifests for installing the development version can be downloaded from the build artifacts of the GitHub actions workflow run. Client programs can also be download by using the command:
 
 ```
-imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:develop -o /tmp/client-programs
+imgpkg pull -i ghcr.io/educates/educates-client-programs:develop -o /tmp/client-programs
 ```
 
 A development build prior to a release would be done against the main Educates GitHub repository. If necessary a developer of some changes could also trigger such a build using GitHub actions from their fork of the Educates GitHub repository. In this case all container image references will resolve to images built and pushed to the developers GitHub container registry namespace and not that of the main Educates GitHub repository. For more complicated changes, it possibly should be a requirement that a developer do a full development build from their fork and test it before creating a pull request with their changes.
diff --git a/docker-extension/Dockerfile b/docker-extension/Dockerfile
index 4ac30c0f9..8ec125f10 100644
--- a/docker-extension/Dockerfile
+++ b/docker-extension/Dockerfile
@@ -22,13 +22,13 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.title="Educates Docker Desktop Extension" \
     org.opencontainers.image.description="Spin up a local Educates Training Platform workshop" \
-    org.opencontainers.image.vendor="VMware" \
+    org.opencontainers.image.vendor="Educates" \
     org.opencontainers.image.licenses="Apache-2.0" \
     com.docker.desktop.extension.api.version="0.3.4" \
     com.docker.extension.screenshots="" \
-    com.docker.desktop.extension.icon="https://raw.githubusercontent.com/vmware-tanzu-labs/educates-training-platform/main/project-assets/educates-logo.svg" \
+    com.docker.desktop.extension.icon="https://raw.githubusercontent.com/educates/educates-training-platform/main/project-assets/educates-logo.svg" \
     com.docker.extension.detailed-description="Spin up a local Educates Training Platform workshop" \
-    com.docker.extension.publisher-url="https://github.com/vmware-tanzu-labs/educates-training-platform" \
+    com.docker.extension.publisher-url="https://github.com/educates/educates-training-platform" \
     com.docker.extension.additional-urls="" \
     com.docker.extension.categories="" \
     com.docker.extension.changelog=""
diff --git a/docker-extension/README.md b/docker-extension/README.md
index bf67638ea..e690234d3 100644
--- a/docker-extension/README.md
+++ b/docker-extension/README.md
@@ -30,13 +30,13 @@ You can use `docker` to build, install and push your extension. Also, we provide
 To build the extension, use `make build-extension` **or**:
 
 ```shell
-  docker buildx build -t vmware-tanzu-labs/educates-docker-extension:develop . --load
+  docker buildx build -t educates/educates-docker-extension:develop . --load
 ```
 
 To install the extension, use `make install-extension` **or**:
 
 ```shell
-  docker extension install vmware-tanzu-labs/educates-docker-extension:develop
+  docker extension install educates/educates-docker-extension:develop
 ```
 
 > If you want to automate this command, use the `-f` or `--force` flag to accept the warning message.
@@ -59,19 +59,19 @@ This starts a development server that listens on port `3000`.
 You can now tell Docker Desktop to use this as the frontend source. In another terminal run:
 
 ```shell
-  docker extension dev ui-source vmware-tanzu-labs/educates-docker-extension:develop http://localhost:3000
+  docker extension dev ui-source educates/educates-docker-extension:develop http://localhost:3000
 ```
 
 In order to open the Chrome Dev Tools for your extension when you click on the extension tab, run:
 
 ```shell
-  docker extension dev debug vmware-tanzu-labs/educates-docker-extension:develop
+  docker extension dev debug educates/educates-docker-extension:develop
 ```
 
 Each subsequent click on the extension tab will also open Chrome Dev Tools. To stop this behaviour, run:
 
 ```shell
-  docker extension dev reset vmware-tanzu-labs/educates-docker-extension:develop
+  docker extension dev reset educates/educates-docker-extension:develop
 ```
 
 ### Backend development (optional)
@@ -84,7 +84,7 @@ Whenever you make changes in the [backend](./backend) source code, you will need
 Use the `docker extension update` command to remove and re-install the extension automatically:
 
 ```shell
-docker extension update vmware-tanzu-labs/educates-docker-extension:develop
+docker extension update educates/educates-docker-extension:develop
 ```
 
 > If you want to automate this command, use the `-f` or `--force` flag to accept the warning message.
@@ -96,7 +96,7 @@ docker extension update vmware-tanzu-labs/educates-docker-extension:develop
 To remove the extension:
 
 ```shell
-docker extension rm vmware-tanzu-labs/educates-docker-extension:develop
+docker extension rm educates/educates-docker-extension:develop
 ```
 
 ## What's next?
diff --git a/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx b/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx
index b424bb416..6fa0aeeaf 100644
--- a/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx
+++ b/docker-extension/ui/src/components/BottomIntroPane/BottomIntroPane.tsx
@@ -4,8 +4,8 @@ import { handleGoTo } from "../../common/goto";
 export default function BottomIntroPane() {
   const docsURL = "https://docs.educates.dev",
     slackURL = "slack.com",
-    demoURL = "https://docs.educates.dev/project-details/sample-screenshots",
-    githubURL = "https://github.com/vmware-tanzu-labs/educates-training-platform";
+    demoURL = "https://docs.educates.dev/en/stable/project-details/sample-screenshots",
+    githubURL = "https://github.com/educates/educates-training-platform";
   return (
     <Box
       position="absolute"
diff --git a/go.work.sum b/go.work.sum
index b5a68c46b..f767dcf98 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -1,3 +1,4 @@
+bitbucket.org/bertimus9/systemstat v0.5.0/go.mod h1:EkUWPp8lKFPMXP8vnbpT5JDI0W/sTiLZAvN8ONWErHY=
 carvel.dev/kapp v0.59.2/go.mod h1:HAeURGw65eT00APPvnOQ8uDx5yvdrro2vtH5VYF1Zz0=
 carvel.dev/ytt v0.47.0/go.mod h1:Xarf0th61vX6VY07l3KBSi3uaMCQ2UyPPiCPiaVpHME=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
@@ -15,6 +16,7 @@ cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb
 cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
 cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY=
 cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk=
+cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
 cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=
 cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
 cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
@@ -53,6 +55,7 @@ cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38Ua
 cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
 cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute v1.25.1 h1:ZRpHJedLtTpKgr3RV1Fx23NuaAEN1Zfx9hw1u4aJdjU=
+cloud.google.com/go/compute v1.25.1/go.mod h1:oopOIR53ly6viBYxaDhBfJwzUAxf1zE//uf3IB011ls=
 cloud.google.com/go/compute v1.27.4 h1:XM8ulx6crjdl09XBfji7viFgZOEQuIxBwKmjRH9Rtmc=
 cloud.google.com/go/compute v1.27.4/go.mod h1:7JZS+h21ERAGHOy5qb7+EPyXlQwzshzrx1x6L9JhTqU=
 cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE=
@@ -167,7 +170,9 @@ github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW
 github.com/Azure/go-autorest/autorest/azure/cli v0.4.1/go.mod h1:JfDgiIO1/RPu6z42AdQTyjOoCM2MFhLqSBDvMEkDgcg=
 github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b/go.mod h1:FNj4KYEAAHfYu68kRYolGoxkaJn+6mdEsaM12VTwuI0=
 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
+github.com/Microsoft/hcsshim v0.8.25/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -208,13 +213,21 @@ github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHe
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
 github.com/cheggaaa/pb/v3 v3.1.4/go.mod h1:6wVjILNBaXMs8c21qRiaUM8BR82erfgau1DQ4iUXmSA=
 github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08/go.mod h1:MAuu1uDJNOS3T3ui0qmKdPUwm59+bO19BbTph2wZafE=
+github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM=
+github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0=
+github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
+github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak=
+github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
+github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
+github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -223,6 +236,7 @@ github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65/go.mod h1:2w+
 github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14/go.mod h1:AlgTssDlstr4mf92TR4DPITLfl5+7wEY4cKStCmeeto=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec=
 github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -249,8 +263,10 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
+github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
+github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
@@ -302,8 +318,10 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gobuffalo/flect v0.2.3/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
+github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -324,6 +342,7 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
+github.com/google/cadvisor v0.49.0/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
 github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
 github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
 github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
@@ -363,6 +382,7 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
 github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
@@ -375,6 +395,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9K
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -384,6 +405,7 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115/go.mod h1:mGrnmO5qnhJIaSiwMo05cvRL6Ww9ccYbTgNFcm6RHZQ=
+github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
 github.com/kisielk/errcheck v1.7.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ=
@@ -412,12 +434,14 @@ github.com/maxbrunsfeld/counterfeiter/v6 v6.7.0/go.mod h1:RVP6/F85JyxTrbJxWIdKU2
 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1/go.mod h1:eyp4DdUJAKkr9tvxR3jWhw2mDK7CWABMG5r9uyaKC7I=
 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/moby/ipvs v1.1.0/go.mod h1:4VJMWuf098bsUMmZEiD4Tjk/O7mOn3l1PTD3s4OoYAs=
 github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
+github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -430,6 +454,9 @@ github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5h
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
+github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
+github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
 github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/generic-admission-server v1.14.1-0.20231020105858-8dcc3c9b298f/go.mod h1:/CLsleDcQ6AFTGKJe9VL3Y4rB9DqX3fQwQv47q2/ZJc=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
@@ -442,6 +469,7 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
 github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
 github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
@@ -464,6 +492,7 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/seccomp/libseccomp-golang v0.10.0/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.1/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -487,6 +516,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
 github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/vmware-tanzu/carvel-imgpkg v0.36.0 h1:ha5a3WUPaqpGlP+QRkKBA9WyT85vUPh7+57x94Cmj58=
 github.com/vmware-tanzu/carvel-imgpkg v0.36.0/go.mod h1:8HeIt+froyx7iRjyZ/4py2wFMPXEFNyWUNUTQgAjD8M=
 github.com/vmware-tanzu/carvel-imgpkg v0.38.2/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE=
@@ -518,6 +548,7 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
+go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0/go.mod h1:XiglO+8SPMqM3Mqh5/rtxR1VHc63o8tb38QrU6tm4mU=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ=
@@ -769,6 +800,7 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR
 google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
 google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
 google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
+google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
 google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
 google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -808,6 +840,7 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8=
 google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI=
 google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY=
 google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
@@ -845,6 +878,7 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
+gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -889,6 +923,7 @@ k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdi
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/metrics v0.29.0/go.mod h1:UCuTT4dC/x/x6ODSk87IWIZQnuAfcwxOjb1gjWJdjMA=
 k8s.io/metrics v0.30.3/go.mod h1:W06L2nXRhOwPkFYDJYWdEIS3u6JcJy3ebIPYbndRs6A=
+k8s.io/system-validators v1.8.0/go.mod h1:gP1Ky+R9wtrSiFbrpEPwWMeYz9yqyy1S/KOh0Vci7WI=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
@@ -909,6 +944,7 @@ sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl
 sigs.k8s.io/controller-runtime v0.15.3/go.mod h1:kp4jckA4vTx281S/0Yk2LFEEQe67mjg+ev/yknv47Ds=
 sigs.k8s.io/controller-tools v0.7.0/go.mod h1:bpBAo0VcSDDLuWt47evLhMLPxRPxMDInTEH/YbdeMK0=
 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
+sigs.k8s.io/knftables v0.0.14/go.mod h1:f/5ZLKYEUPUhVjUCg6l80ACdL7CIIyeL0DxfgojGRTk=
 sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY=
 sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3/go.mod h1:/d88dHCvoy7d0AKFT0yytezSGZKjsZBVs9YTkBHSGFk=
 sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag=
diff --git a/package-repository/.imgpkg/bundle.yml b/package-repository/.imgpkg/bundle.yml
index b54f590d2..3838bc893 100644
--- a/package-repository/.imgpkg/bundle.yml
+++ b/package-repository/.imgpkg/bundle.yml
@@ -5,8 +5,6 @@ metadata:
   name: educates
 authors:
   - name: Graham Dumpleton
-    email: graham.dumpleton@broadcom.com
+    email: graham.dumpleton@gmail.com
   - name: Jorge Morales
-    email: jorge.morales@broadcom.com
-websites:
-  - url: github.com/vmware-tanzu-labs/educates-package-repository
+    email: jorgemoralespou@gmail.com
diff --git a/package-repository/packages/installer.educates.dev/metadata.yaml b/package-repository/packages/installer.educates.dev/metadata.yaml
index b665b3efa..7a84ba5c7 100644
--- a/package-repository/packages/installer.educates.dev/metadata.yaml
+++ b/package-repository/packages/installer.educates.dev/metadata.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   displayName: "Educates Training Platform Installer"
   shortDescription: "Installer for Educates, a platform for hosting interactive workshop environments in Kubernetes."
-  providerName: VMware
+  providerName: Educates
   maintainers:
     - name: "Graham Dumpleton"
     - name: "Jorge Morales"
diff --git a/project-docs/custom-resources/training-portal.md b/project-docs/custom-resources/training-portal.md
index 44a8034d4..7a89ecdcc 100644
--- a/project-docs/custom-resources/training-portal.md
+++ b/project-docs/custom-resources/training-portal.md
@@ -436,7 +436,7 @@ spec:
   - name: lab-markdown-sample
     env:
     - name: REPOSITORY_URL
-      value: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+      value: https://github.com/educates/lab-markdown-sample
 ```
 
 Values of fields in the list of resource objects can reference a number of pre-defined parameters. The available parameters are:
diff --git a/project-docs/custom-resources/workshop-definition.md b/project-docs/custom-resources/workshop-definition.md
index ddd3c8a3f..fd49b7224 100644
--- a/project-docs/custom-resources/workshop-definition.md
+++ b/project-docs/custom-resources/workshop-definition.md
@@ -39,7 +39,7 @@ metadata:
 spec:
   title: Markdown Sample
   description: A sample workshop using Markdown
-  url: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+  url: https://github.com/educates/lab-markdown-sample
   difficulty: beginner
   duration: 15m
   vendor: educates.dev
@@ -352,7 +352,7 @@ To download workshop content using ``content.files`` set the field to the locati
 ```yaml
 spec:
   content:
-    files: github.com/vmware-tanzu-labs/lab-markdown-sample
+    files: github.com/educates/lab-markdown-sample
 ```
 
 The location can be a GitHub or GitLab repository reference, a URL to a tarball hosted on a HTTP server, or a reference to an OCI image artifact on a registry.
@@ -505,7 +505,7 @@ spec:
     - name: tce
       files:
       - image:
-          url: ghcr.io/vmware-tanzu-labs/educates-extension-packages/tce-0.12:sha-5f9081f
+          url: ghcr.io/educates/educates-extension-packages/tce-0.12:sha-5f9081f
 ```
 
 When a package is installed it is placed under a sub directory of ``/opt/packages`` with name corresponding to the ``name`` field in the ``packages`` configuration. Any setup scripts contained in the ``setup.d`` directory of the installed package will be run when the workshop session starts, with the shell environment being configured using any scripts in the ``profile.d`` of the installed package.
@@ -518,7 +518,7 @@ If credentials are required to access any remote server, these can be supplied v
 
 For a number of extension packages being maintained by the Educates team see:
 
-* [https://github.com/vmware-tanzu-labs/educates-extension-packages](https://github.com/vmware-tanzu-labs/educates-extension-packages)
+* [https://github.com/educates/educates-extension-packages](https://github.com/educates/educates-extension-packages)
 
 Setting environment variables
 -----------------------------
@@ -530,7 +530,7 @@ spec:
   session:
     env:
     - name: REPOSITORY_URL
-      value: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+      value: https://github.com/educates/lab-markdown-sample
 ```
 
 The ``session.env`` field should be a list of dictionaries with a ``name`` field giving the name of the environment variable.
@@ -1205,7 +1205,7 @@ spec:
     assets:
       files:
       - image:
-          url: ghcr.io/vmware-tanzu-labs/workshop-files:latest
+          url: ghcr.io/educates/workshop-files:latest
 ```
 
 The URL values can reference any of the environment download data variables which may be appropriate.
@@ -1236,7 +1236,7 @@ spec:
         enabled: true
       files:
       - image:
-          url: ghcr.io/vmware-tanzu-labs/workshop-files:latest
+          url: ghcr.io/educates/workshop-files:latest
 ```
 
 In this case the data variable ``$(assets_repository)`` will be the public hostname for the assets server and anonymous access is always possible. The URL for accessing the assets server would be ``$(ingress_protocol)://$(assets_repository)``.
@@ -1254,7 +1254,7 @@ spec:
       storage: 5Gi
       files:
       - image:
-          url: ghcr.io/vmware-tanzu-labs/workshop-files:latest
+          url: ghcr.io/educates/workshop-files:latest
 ```
 
 The HTTP server used to serve up assets by default will be given 128Mi of memory. If you need to customize this value you can override the memory:
@@ -1287,7 +1287,7 @@ spec:
         enabled: true
       files:
       - image:
-          url: ghcr.io/vmware-tanzu-labs/workshop-files:latest
+          url: ghcr.io/educates/workshop-files:latest
         path: workshop-files
 ```
 
diff --git a/project-docs/custom-resources/workshop-environment.md b/project-docs/custom-resources/workshop-environment.md
index aeeb3660f..d5e682c64 100644
--- a/project-docs/custom-resources/workshop-environment.md
+++ b/project-docs/custom-resources/workshop-environment.md
@@ -48,7 +48,7 @@ spec:
   session:
     env:
     - name: REPOSITORY_URL
-      value: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+      value: https://github.com/educates/lab-markdown-sample
 ```
 
 You might use this to set the location of a backend service, such as an image registry, to be used by the workshop.
diff --git a/project-docs/custom-resources/workshop-session.md b/project-docs/custom-resources/workshop-session.md
index 1c5c24214..0d7b7a3f0 100644
--- a/project-docs/custom-resources/workshop-session.md
+++ b/project-docs/custom-resources/workshop-session.md
@@ -146,7 +146,7 @@ spec:
     id: user1
     env:
     - name: REPOSITORY_URL
-      value: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+      value: https://github.com/educates/lab-markdown-sample
 ```
 
 Values of fields in the list of resource objects can reference a number of pre-defined parameters. The available parameters are:
diff --git a/project-docs/getting-started/quick-start-guide.md b/project-docs/getting-started/quick-start-guide.md
index eec3636e4..9f7495662 100644
--- a/project-docs/getting-started/quick-start-guide.md
+++ b/project-docs/getting-started/quick-start-guide.md
@@ -50,7 +50,7 @@ Downloading the CLI
 
 To download the Educates CLI visit the releases page at:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/releases](https://github.com/vmware-tanzu-labs/educates-training-platform/releases)
+* [https://github.com/educates/educates-training-platform/releases](https://github.com/educates/educates-training-platform/releases)
 
 Find the most recent released version and download the `educates` CLI program for your platform.
 
@@ -67,25 +67,25 @@ To download the latest version using `curl` and mark it executable, you can use
 
 :::{tab-item} Linux (amd64)
 ```
-curl -o educates -sL https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-linux-amd64 && chmod +x educates
+curl -o educates -sL https://github.com/educates/educates-training-platform/releases/latest/download/educates-linux-amd64 && chmod +x educates
 ```
 :::
 
 :::{tab-item} Linux (arm64)
 ```
-curl -o educates -sL https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-linux-arm64 && chmod +x educates
+curl -o educates -sL https://github.com/educates/educates-training-platform/releases/latest/download/educates-linux-arm64 && chmod +x educates
 ```
 :::
 
 :::{tab-item} macOS (amd64)
 ```
-curl -o educates -sL https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-darwin-amd64 && chmod +x educates
+curl -o educates -sL https://github.com/educates/educates-training-platform/releases/latest/download/educates-darwin-amd64 && chmod +x educates
 ```
 :::
 
 :::{tab-item} macOS (arm64)
 ```
-curl -o educates -sL https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-darwin-arm64 && chmod +x educates
+curl -o educates -sL https://github.com/educates/educates-training-platform/releases/latest/download/educates-darwin-arm64 && chmod +x educates
 ```
 :::
 
@@ -93,10 +93,10 @@ curl -o educates -sL https://github.com/vmware-tanzu-labs/educates-training-plat
 
 If you are running macOS with Apple silicon (arm64), the Intel 64 (amd64) binary will still work and be run under Rosetta emulation, however, by using it you will be able to use both `amd64` and `arm64` images in the Kubernetes cluster. If you use the Apple silicon (arm64) binary you will only be able to use `amd64` images in the Kubernetes cluster. Neither of the macOS binaries are signed so you will need to tell macOS to trust it before you can run it.
 
-The `educates` CLI can also be downloaded from the `vmware-tanzu-labs/educates-training-platform` GitHub repository packaged as an OCI image using the command:
+The `educates` CLI can also be downloaded from the `educates/educates-training-platform` GitHub repository packaged as an OCI image using the command:
 
 ```
-imgpkg pull -i ghcr.io/vmware-tanzu-labs/educates-client-programs:X.Y.Z -o educates-client-programs
+imgpkg pull -i ghcr.io/educates/educates-client-programs:X.Y.Z -o educates-client-programs
 ```
 
 Replace `X.Y.Z` with the version of Educates you want to use. Use the appropriate binary found in the `educates-client-programs` sub directory which is created.
@@ -108,7 +108,7 @@ Note that the `imgpkg` command pulls down an OCI image artefact from GitHub cont
 The OCI image containing the `educates` CLI can also be used in a `Dockerfile` if needing to embed the `educates` CLI in a container image:
 
 ```
-FROM ghcr.io/vmware-tanzu-labs/educates-client-programs:X.Y.Z AS client-programs
+FROM ghcr.io/educates/educates-client-programs:X.Y.Z AS client-programs
 
 FROM fedora:39
 
diff --git a/project-docs/getting-started/workshop-templates.md b/project-docs/getting-started/workshop-templates.md
index bfa0863b9..c79809aa4 100644
--- a/project-docs/getting-started/workshop-templates.md
+++ b/project-docs/getting-started/workshop-templates.md
@@ -117,7 +117,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Create release
-        uses: vmware-tanzu-labs/educates-github-actions/publish-workshop@v6
+        uses: educates/educates-github-actions/publish-workshop@v6
         with:
           token: ${{secrets.GITHUB_TOKEN}}
 ```
@@ -144,7 +144,7 @@ Note that if the GitHub repository is not public, you will need to go to the set
 To use the workshop, you can explicitly load the workshop definition using the `workshop.yaml` file attached to the GitHub release, and then add it to an appropriate training portal, or you could use the Educates command line and run `educates deploy-workshop` supplying the URL for the `workshop.yaml` file attached to the GitHub release: 
 
 ```
-educates deploy-workshop -f https://github.com/vmware-tanzu-labs/lab-k8s-fundamentals/releases/latest/download/workshop.yaml
+educates deploy-workshop -f https://github.com/educates/lab-k8s-fundamentals/releases/latest/download/workshop.yaml
 ```
 
-See the more detailed [documentation](https://github.com/vmware-tanzu-labs/educates-github-actions/blob/main/publish-workshop/README.md) about the GitHub action used to publish the workshop on how to configure it.
+See the more detailed [documentation](https://github.com/educates/educates-github-actions/blob/main/publish-workshop/README.md) about the GitHub action used to publish the workshop on how to configure it.
diff --git a/project-docs/installation-guides/carvel-based-installation.md b/project-docs/installation-guides/carvel-based-installation.md
index ebe716aec..957cd9f1e 100644
--- a/project-docs/installation-guides/carvel-based-installation.md
+++ b/project-docs/installation-guides/carvel-based-installation.md
@@ -37,10 +37,10 @@ Because the Educates training platform may need to create instances of any avail
 To create the required service account and role bindings a YAML resources file is provided with each Educates release. To apply this for the latest version of Educates to the cluster, run the command:
 
 ```bash
-kubectl apply -f https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-installer-app-rbac.yaml
+kubectl apply -f https://github.com/educates/educates-training-platform/releases/latest/download/educates-installer-app-rbac.yaml
 ```
 
-Alternatively, checkout the [Educates releases](https://github.com/vmware-tanzu-labs/educates-training-platform/releases) and use the `educates-installer-app-rbac.yaml` file from the specific version of Educates you want to install.
+Alternatively, checkout the [Educates releases](https://github.com/educates/educates-training-platform/releases) and use the `educates-installer-app-rbac.yaml` file from the specific version of Educates you want to install.
 
 Note that a namespace called `educates-installer` will be created to hold the service account.
 
@@ -65,10 +65,10 @@ You are now ready to install Educates and any required services as dictated by t
 For the latest version of Educates, run the following command:
 
 ```bash
-kubectl apply -f https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest/download/educates-installer-app.yaml
+kubectl apply -f https://github.com/educates/educates-training-platform/releases/latest/download/educates-installer-app.yaml
 ```
 
-Alternatively, checkout the [Educates releases](https://github.com/vmware-tanzu-labs/educates-training-platform/releases) and use the `educates-installer-app.yaml` file from the specific version of Educates you want to install.
+Alternatively, checkout the [Educates releases](https://github.com/educates/educates-training-platform/releases) and use the `educates-installer-app.yaml` file from the specific version of Educates you want to install.
 
 The same `educates-installer` namespace referenced in prior steps will be used.
 
diff --git a/project-docs/project-details/project-overview.md b/project-docs/project-details/project-overview.md
index d2cfcbc3e..381b382ad 100644
--- a/project-docs/project-details/project-overview.md
+++ b/project-docs/project-details/project-overview.md
@@ -10,14 +10,14 @@ Source code repositories
 
 The source code repository for the Educates training platform can be found at:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform](https://github.com/vmware-tanzu-labs/educates-training-platform)
+* [https://github.com/educates/educates-training-platform](https://github.com/educates/educates-training-platform)
 
 Latest project release
 ----------------------
 
 To determine what is the most recent released version of Educates, see:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest](https://github.com/vmware-tanzu-labs/educates-training-platform/releases/latest)
+* [https://github.com/educates/educates-training-platform/releases/latest](https://github.com/educates/educates-training-platform/releases/latest)
 
 Getting help with Educates
 --------------------------
@@ -27,7 +27,7 @@ the [Kubernetes community Slack](https://kubernetes.slack.com/).
 
 If you have found a bug in Educates or want to request a feature, you can use
 our [GitHub issue
-tracker](https://github.com/vmware-tanzu-labs/educates-training-platform/issues).
+tracker](https://github.com/educates/educates-training-platform/issues).
 
 Overall goals of the project
 ----------------------------
diff --git a/project-docs/project-details/project-roadmap.md b/project-docs/project-details/project-roadmap.md
index 0560e2c1b..f8578d891 100644
--- a/project-docs/project-details/project-roadmap.md
+++ b/project-docs/project-details/project-roadmap.md
@@ -2,7 +2,7 @@ Project Roadmap
 ===============
 
 For long term project plans see the [project
-roadmap](https://github.com/vmware-tanzu-labs/educates-training-platform/blob/develop/developer-docs/project-roadmap.md)
+roadmap](https://github.com/educates/educates-training-platform/blob/develop/developer-docs/project-roadmap.md)
 included in the project source code.
 
 Details of more immediate plans are listed below.
diff --git a/project-docs/workshop-content/building-an-image.md b/project-docs/workshop-content/building-an-image.md
index bf190d9b7..90523ee32 100644
--- a/project-docs/workshop-content/building-an-image.md
+++ b/project-docs/workshop-content/building-an-image.md
@@ -9,7 +9,7 @@ Structure of the Dockerfile
 The structure of the ``Dockerfile`` to build a custom workshop base image should start out as:
 
 ```text
-FROM ghcr.io/vmware-tanzu-labs/educates-base-environment:2.6
+FROM ghcr.io/educates/educates-base-environment:3.1
 
 COPY --chown=1001:0 . /home/eduk8s/
 
@@ -18,7 +18,7 @@ RUN mv /home/eduk8s/workshop /opt/workshop
 RUN fix-permissions /home/eduk8s
 ```
 
-A custom workshop image needs to be built on the ``ghcr.io/vmware-tanzu-labs/educates/base-environment`` workshop image.
+A custom workshop image needs to be built on the ``ghcr.io/educates/educates/base-environment`` workshop image.
 
 Where the custom workshop image will also include files for a specific workshop, the default actions you include when building the container image should include copying all files to the ``/home/eduk8s`` directory. The ``--chown=1001:0`` option ensures that files are owned by the appropriate user and group. The ``workshop`` subdirectory is then moved to ``/opt/workshop`` so that it is out of the way and not visible to the user. This is a special location which will be searched for workshop content, in addition to ``/home/eduk8s/workshop``. To have other files or directories from the repository ignored, list them in the ``.dockerignore`` file.
 
@@ -30,14 +30,14 @@ Bases images and version tags
 The sample ``Dockerfile`` provided above references the workshop base image as:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-base-environment:2.6
+ghcr.io/educates/educates-base-environment:3.1
 ```
 
 This needs to be changed and the version kept up to date and match the version of Educates you want to use.
 
 To see what versions are available of the ``base-environment`` image visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-base-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-base-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-base-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-base-environment)
 
 Custom workshop base images
 ---------------------------
@@ -49,42 +49,42 @@ For using the Java programming language, the Educates project provides separate
 The name of the JDK 8 version of the Java custom workshop base image is:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-jdk8-environment:2.6
+ghcr.io/educates/educates-jdk8-environment:3.1
 ```
 
 To see what specific tagged version of the image exist visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk8-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk8-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk8-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk8-environment)
 
 The name of the JDK 11 version of the Java custom workshop base image is:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-jdk11-environment:2.6
+ghcr.io/educates/educates-jdk11-environment:3.1
 ```
 
 To see what specific tagged version of the image exist visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk11-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk11-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk11-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk11-environment)
 
 The name of the JDK 17 version of the Java custom workshop base image is:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-jdk17-environment:2.6
+ghcr.io/educates/educates-jdk17-environment:3.1
 ```
 
 To see what specific tagged version of the image exist visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk17-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk17-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk17-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk17-environment)
 
 The name of the JDK 21 version of the Java custom workshop base image is:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-jdk21-environment:2.6
+ghcr.io/educates/educates-jdk21-environment:3.1
 ```
 
 To see what specific tagged version of the image exist visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk21-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-jdk21-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk21-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-jdk21-environment)
 
 The images will be updated over time to try and include the latest versions of Gradle and Maven. In case you are using Gradle or Maven wrapper scripts for selecting a specific version of these tools, configuration for these wrapper scripts is provided for the pre-installed version to avoid it being downloaded again.
 
@@ -93,12 +93,12 @@ If wanting to run workshops based around using Anaconda Python or Jupyter notebo
 The name of the Anaconda workshop base image is:
 
 ```
-ghcr.io/vmware-tanzu-labs/educates-conda-environment:2.6
+ghcr.io/educates/educates-conda-environment:3.1
 ```
 
 To see what specific tagged version of the image exist visit:
 
-* [https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-conda-environment](https://github.com/vmware-tanzu-labs/educates-training-platform/pkgs/container/educates-conda-environment)
+* [https://github.com/educates/educates-training-platform/pkgs/container/educates-conda-environment](https://github.com/educates/educates-training-platform/pkgs/container/educates-conda-environment)
 
 Container run as random user ID
 -------------------------------
diff --git a/project-docs/workshop-content/working-on-content.md b/project-docs/workshop-content/working-on-content.md
index 71a5fc164..334323ff8 100644
--- a/project-docs/workshop-content/working-on-content.md
+++ b/project-docs/workshop-content/working-on-content.md
@@ -193,7 +193,7 @@ spec:
   title: Sample Workshop
   description: A sample workshop
   workshop:
-    image: ghcr.io/vmware-tanzu-labs/lab-sample-workshop:latest
+    image: ghcr.io/educates/lab-sample-workshop:latest
 ```
 
 When an image tag of ``main``, ``master``, ``develop`` or ``latest`` is used, the image pull policy will be set to ``Always`` ensuring that the custom workshop image will be pulled down again for a new workshop session if the remote image had changed. If the image tag was for a specific version, it would be necessary to change the workshop definition every time there was a change to the workshop image.
@@ -212,10 +212,10 @@ spec:
   title: Sample Workshop
   description: A sample workshop
   workshop:
-    image: ghcr.io/vmware-tanzu-labs/lab-sample-workshop-image:latest
+    image: ghcr.io/educates/lab-sample-workshop-image:latest
     files:
     - image:
-        url: ghcr.io/vmware-tanzu-labs/lab-sample-workshop-files:latest
+        url: ghcr.io/educates/lab-sample-workshop-files:latest
 ```
 
 By pulling down the workshop content as an overlay when the workshop session started, on top of the contents of the custom workshop image, you only need to rebuild the custom workshop image when needing to make changes to what additional tools are needed, or when you want to ensure the latest workshop instructions are also a part of the final custom workshop image.
@@ -233,10 +233,10 @@ spec:
   title: Sample Workshop
   description: A sample workshop
   workshop:
-    image: ghcr.io/vmware-tanzu-labs/custom-environment:latest
+    image: ghcr.io/educates/custom-environment:latest
     files:
     - image:
-        url: ghcr.io/vmware-tanzu-labs/lab-sample-workshop-files:latest
+        url: ghcr.io/educates/lab-sample-workshop-files:latest
 ```
 
 This separates generic tooling from specific workshops and allows the custom workshop base image to be used for multiple workshops on different, but related topics, which require the same tooling.
diff --git a/project-docs/workshop-content/workshop-configuration.md b/project-docs/workshop-content/workshop-configuration.md
index 6ef902646..4d2885798 100644
--- a/project-docs/workshop-content/workshop-configuration.md
+++ b/project-docs/workshop-content/workshop-configuration.md
@@ -19,7 +19,7 @@ spec:
   workshop:
     files:
     - git:
-        url: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+        url: https://github.com/educates/lab-markdown-sample
         ref: origin/main
       includePaths:
       - /workshop/**
@@ -51,7 +51,7 @@ spec:
     image: jdk17-environment:*
     files:
     - git:
-        url: https://github.com/vmware-tanzu-labs/lab-markdown-sample
+        url: https://github.com/educates/lab-markdown-sample
         ref: origin/main
       includePaths:
       - /workshop/**
@@ -80,7 +80,7 @@ spec:
   title: Markdown Sample
   description: A sample workshop using Markdown
   workshop:
-    image: ghcr.io/vmware-tanzu-labs/lab-markdown-sample:latest
+    image: ghcr.io/educates/lab-markdown-sample:latest
   session:
     namespaces:
       budget: small
diff --git a/workshop-images/base-environment/opt/gateway/package.json b/workshop-images/base-environment/opt/gateway/package.json
index fc8ea886e..b41c3c8f7 100644
--- a/workshop-images/base-environment/opt/gateway/package.json
+++ b/workshop-images/base-environment/opt/gateway/package.json
@@ -4,7 +4,7 @@
   "description": "Gateway for Educates.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vmware-tanzu-labs/educates-training-platform.git"
+    "url": "https://github.com/educates/educates-training-platform.git"
   },
   "main": "build/backend/server.js",
   "scripts": {
diff --git a/workshop-images/base-environment/opt/helper/package.json b/workshop-images/base-environment/opt/helper/package.json
index 5da2840e1..f3f2a665b 100644
--- a/workshop-images/base-environment/opt/helper/package.json
+++ b/workshop-images/base-environment/opt/helper/package.json
@@ -7,7 +7,7 @@
 	"publisher": "Educates",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/vmware-tanzu-labs/educates-training-platform.git"
+		"url": "https://github.com/educates/educates-training-platform.git"
 	},
 	"engines": {
 		"vscode": "^1.45.0"
diff --git a/workshop-images/base-environment/opt/renderer/package.json b/workshop-images/base-environment/opt/renderer/package.json
index 2e73c574f..540ff31d8 100644
--- a/workshop-images/base-environment/opt/renderer/package.json
+++ b/workshop-images/base-environment/opt/renderer/package.json
@@ -4,7 +4,7 @@
   "description": "Renderer for Educates",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vmware-tanzu-labs/educates-training-platform.git"
+    "url": "https://github.com/educates/educates-training-platform.git"
   },
   "main": "build/backend/server.js",
   "scripts": {

From a03a7919fb456573dae83e3dbe4a11561da4e312 Mon Sep 17 00:00:00 2001
From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
Date: Wed, 6 Nov 2024 11:50:47 +1100
Subject: [PATCH 2/3] Add release notes for 3.1.0.

---
 project-docs/index.rst                      | 1 +
 project-docs/release-notes/version-3.1.0.md | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 project-docs/release-notes/version-3.1.0.md

diff --git a/project-docs/index.rst b/project-docs/index.rst
index bba4156ec..5a9dac3ea 100644
--- a/project-docs/index.rst
+++ b/project-docs/index.rst
@@ -81,6 +81,7 @@ Educates
   :maxdepth: 2
   :caption: Release Notes:
 
+  release-notes/version-3.1.0
   release-notes/version-3.0.1
   release-notes/version-3.0.0
   release-notes/version-2.7.2
diff --git a/project-docs/release-notes/version-3.1.0.md b/project-docs/release-notes/version-3.1.0.md
new file mode 100644
index 000000000..0632b5447
--- /dev/null
+++ b/project-docs/release-notes/version-3.1.0.md
@@ -0,0 +1,6 @@
+Version 3.1.0
+=============
+
+The only changes in this version are to support the relocation of the Educates
+source code repositories to under the [Educates](https://github.com/educates)
+organization in GitHub.

From 1aa510347fcdd7b51644f8625391ff805aae0409 Mon Sep 17 00:00:00 2001
From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
Date: Wed, 6 Nov 2024 11:59:56 +1100
Subject: [PATCH 3/3] Remove CLA references as no longer use CLA bot.

---
 CODE_OF_CONDUCT.md | 2 +-
 CONTRIBUTING.md    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 410e2351e..e6639a9ad 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -59,7 +59,7 @@ 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 oss-coc@vmware.com.
+reported to the community leaders responsible for enforcement.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7cf75c4b6..34bf2842f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,10 +24,6 @@ We welcome many different types of contributions and not all of them need a pull
 
 Please familiarize yourself with the [Code of Conduct](CODE_OF_CONDUCT.md) before contributing.
 
-## Contributor License Agreement
-
-Before you start working with Educates, please read our Contributor License Agreement [CLA](https://cla.vmware.com/cla/1/preview). If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue and walk you through the process when you open your first pull request. For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq).
-
 ## Getting started
 
 If your primary objective is to use Educates, check out the [Educates user documentation](https://docs.educates.dev/).