diff --git a/deploy_carvel/build.sh b/deploy_carvel/build.sh
index 7bf087b9..1636b59f 100755
--- a/deploy_carvel/build.sh
+++ b/deploy_carvel/build.sh
@@ -91,11 +91,6 @@ do
   echo_yellow "handling ${resource_name}..."
 
   # just simple templating
-  # ytt --file "./${resource_name}}/config/"
-  # template, but process with kbld to update the yaml files with image digests such as
-  #    image: index.docker.io/<repo>/<image>@sha256:<hash>
-  # ytt --file "./${resource_name}}/config/" | kbld --file -
-
   echo_yellow "generating ${resource_name}/.imgpkg/images.yaml"
   # there are bits for image substitution in some of the ytt commands
   kbld --file "./${resource_name}/config/" --imgpkg-lock-output "./${resource_name}/.imgpkg/images.yml"
@@ -121,7 +116,6 @@ do
     --file "${resource_name}/package-template.yml" \
     --data-value-file openapi="$(pwd)/${resource_name}/schema-openapi.yml" \
     --data-value package_version="${PINNIPED_PACKAGE_VERSION}" \
-    --data-value namespace="${KAPP_CONTROLLER_GLOBAL_NAMESPACE}" \
     --data-value package_image_repo="${package_push_repo_location}" > "${PACKAGE_REPOSITORY_DIR}/packages/${resource_package_version}/${PINNIPED_PACKAGE_VERSION}.yml"
 
   echo_yellow "generating ./${PACKAGE_REPOSITORY_DIR}/packages/${resource_package_version}/metadata.yml"
@@ -129,7 +123,6 @@ do
     --file "${resource_name}/metadata.yml" \
     --data-value-file openapi="$(pwd)/${resource_name}/schema-openapi.yml" \
     --data-value package_version="${PINNIPED_PACKAGE_VERSION}" \
-    --data-value namespace="${KAPP_CONTROLLER_GLOBAL_NAMESPACE}" \
     --data-value package_image_repo="${package_push_repo_location}" > "${PACKAGE_REPOSITORY_DIR}/packages/${resource_package_version}/metadata.yml"
 
 done
@@ -149,7 +142,7 @@ echo_yellow "deploying PackageRepository..."
 PINNIPED_PACKGE_REPOSITORY_NAME="pinniped-package-repository"
 PINNIPED_PACKGE_REPOSITORY_FILE="packagerepository.${PINNIPED_PACKAGE_VERSION}.yml"
 echo -n "" > "${PINNIPED_PACKGE_REPOSITORY_FILE}"
-# kapp-controller's packaging-global-namespace does not apply to PackageRepository
+
 cat <<EOT >> "${PINNIPED_PACKGE_REPOSITORY_FILE}"
 ---
 apiVersion: packaging.carvel.dev/v1alpha1
diff --git a/deploy_carvel/concierge/metadata.yml b/deploy_carvel/concierge/metadata.yml
index d1a57b1f..0a739928 100644
--- a/deploy_carvel/concierge/metadata.yml
+++ b/deploy_carvel/concierge/metadata.yml
@@ -5,7 +5,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: PackageMetadata
 metadata:
   name: concierge.pinniped.dev
-  namespace: #@ data.values.namespace
 spec:
   displayName: "Pinniped Concierge"
   longDescription: "Pinniped concierge enables consistent login across Kubernetes clusters on public cloud providers such as AKS, EKS and GKE"
diff --git a/deploy_carvel/concierge/package-template.yml b/deploy_carvel/concierge/package-template.yml
index 6b351420..96cfd06e 100644
--- a/deploy_carvel/concierge/package-template.yml
+++ b/deploy_carvel/concierge/package-template.yml
@@ -5,7 +5,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: #@ "concierge.pinniped.dev." + data.values.package_version
-  namespace: #@ data.values.namespace
 spec:
   refName: concierge.pinniped.dev
   version: #@ data.values.package_version
diff --git a/deploy_carvel/package-repository/.imgpkg/images.yml b/deploy_carvel/package-repository/.imgpkg/images.yml
index 2a6b7ebc..62fc5bcf 100644
--- a/deploy_carvel/package-repository/.imgpkg/images.yml
+++ b/deploy_carvel/package-repository/.imgpkg/images.yml
@@ -7,12 +7,12 @@ images:
       - resolved:
           tag: 0.25.0
           url: benjaminapetersen/pinniped-package-repo-package-concierge:0.25.0
-  image: index.docker.io/benjaminapetersen/pinniped-package-repo-package-concierge@sha256:eb9f9d4ad2690443b7824a183c2a296a744995559285352422f94f2295c4a754
+  image: index.docker.io/benjaminapetersen/pinniped-package-repo-package-concierge@sha256:bcf825330cf8946b4c9a7a0cc7a774748dd519c4fe1c22a076b64dc9f369c59c
 - annotations:
     kbld.carvel.dev/id: benjaminapetersen/pinniped-package-repo-package-supervisor:0.25.0
     kbld.carvel.dev/origins: |
       - resolved:
           tag: 0.25.0
           url: benjaminapetersen/pinniped-package-repo-package-supervisor:0.25.0
-  image: index.docker.io/benjaminapetersen/pinniped-package-repo-package-supervisor@sha256:3da81c3b0554e4e59ee1c8e63d582a753c9b9c7deb170d35209d3f1ee7df2245
+  image: index.docker.io/benjaminapetersen/pinniped-package-repo-package-supervisor@sha256:12577787d82b4f565be28c65c229c87dd8ac9890d0f44a690725fdb4ac7f4082
 kind: ImagesLock
diff --git a/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml b/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
index 64f23bf8..05cab1ac 100644
--- a/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
+++ b/deploy_carvel/package-repository/packages/concierge.pinniped.dev/0.25.0.yml
@@ -2,7 +2,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: concierge.pinniped.dev.0.25.0
-  namespace: kapp-controller-packaging-global
 spec:
   refName: concierge.pinniped.dev
   version: 0.25.0
diff --git a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
index d1e748c2..7a4bb9e4 100644
--- a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
+++ b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/0.25.0.yml
@@ -2,7 +2,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: supervisor.pinniped.dev.0.25.0
-  namespace: kapp-controller-packaging-global
 spec:
   refName: supervisor.pinniped.dev
   version: 0.25.0
diff --git a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/metadata.yml b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/metadata.yml
index 18f2c173..9b4be984 100644
--- a/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/metadata.yml
+++ b/deploy_carvel/package-repository/packages/supervisor.pinniped.dev/metadata.yml
@@ -2,7 +2,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: PackageMetadata
 metadata:
   name: supervisor.pinniped.dev
-  namespace: kapp-controller-packaging-global
 spec:
   displayName: Pinniped Supervisor
   longDescription: Pinniped supervisor allows seamless login across one or many Kubernetes clusters including AKS, EKS and GKE
diff --git a/deploy_carvel/supervisor/metadata.yml b/deploy_carvel/supervisor/metadata.yml
index fb0e6e95..f1111395 100644
--- a/deploy_carvel/supervisor/metadata.yml
+++ b/deploy_carvel/supervisor/metadata.yml
@@ -5,7 +5,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: PackageMetadata
 metadata:
   name: supervisor.pinniped.dev
-  namespace: #@ data.values.namespace
 spec:
   displayName: "Pinniped Supervisor"
   longDescription: "Pinniped supervisor allows seamless login across one or many Kubernetes clusters including AKS, EKS and GKE"
diff --git a/deploy_carvel/supervisor/package-template.yml b/deploy_carvel/supervisor/package-template.yml
index b4e1f25e..150c6419 100644
--- a/deploy_carvel/supervisor/package-template.yml
+++ b/deploy_carvel/supervisor/package-template.yml
@@ -5,7 +5,6 @@ apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
   name: #@ "supervisor.pinniped.dev." + data.values.package_version
-  namespace: #@ data.values.namespace
 spec:
   refName: supervisor.pinniped.dev
   version: #@ data.values.package_version