diff --git a/deploy_carvel/concierge-pkginstall.yml b/deploy_carvel/concierge-pkginstall.yml
index 007f1f8f..1da4bf1c 100644
--- a/deploy_carvel/concierge-pkginstall.yml
+++ b/deploy_carvel/concierge-pkginstall.yml
@@ -10,7 +10,7 @@ spec:
   packageRef:
     refName: "concierge.pinniped.dev"
     versionSelection:
-      constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04"
+      constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
   values:
   - secretRef:
       name: "concierge-package-install-secret"
@@ -29,4 +29,4 @@ stringData:
     log_level: debug
 
     image_repo: kind-registry.local:5000/test/build
-    image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
diff --git a/deploy_carvel/local-user-authenticator-pkginstall.yml b/deploy_carvel/local-user-authenticator-pkginstall.yml
index bc950c0a..2de09a06 100644
--- a/deploy_carvel/local-user-authenticator-pkginstall.yml
+++ b/deploy_carvel/local-user-authenticator-pkginstall.yml
@@ -10,7 +10,7 @@ spec:
   packageRef:
     refName: "local-user-authenticator.pinniped.dev"
     versionSelection:
-      constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04"
+      constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
   values:
   - secretRef:
       name: "local-user-authenticator-package-install-secret"
@@ -24,4 +24,4 @@ stringData:
   values.yml: |
     ---
     image_repo: kind-registry.local:5000/test/build
-    image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
diff --git a/deploy_carvel/package_repository/.imgpkg/images.yml b/deploy_carvel/package_repository/.imgpkg/images.yml
index 17bc6c5e..bc04629b 100644
--- a/deploy_carvel/package_repository/.imgpkg/images.yml
+++ b/deploy_carvel/package_repository/.imgpkg/images.yml
@@ -2,24 +2,24 @@
 apiVersion: imgpkg.carvel.dev/v1alpha1
 images:
 - annotations:
-    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
     kbld.carvel.dev/origins: |
       - resolved:
-          tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
-          url: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
+          url: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   image: kind-registry.local:5000/test/build/test/build-package-concierge@sha256:ffc8371ff94e939233af0643476a597c025adb5609cc35c5ded6bd67ce13fdec
 - annotations:
-    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
     kbld.carvel.dev/origins: |
       - resolved:
-          tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
-          url: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
+          url: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator@sha256:4f111f27ecf38622e4cbb29ce1d88589b488d8eb57d9b29cb577d64a417a2c4c
 - annotations:
-    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    kbld.carvel.dev/id: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
     kbld.carvel.dev/origins: |
       - resolved:
-          tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
-          url: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
+          url: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   image: kind-registry.local:5000/test/build/test/build-package-supervisor@sha256:f3ceb23f0202c83955f4ad1a7836325340da25ebb6d2e14f02a66e915b4e09f5
 kind: ImagesLock
diff --git a/deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml b/deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
similarity index 98%
rename from deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
rename to deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
index 05f9351b..7c65e2c6 100644
--- a/deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
+++ b/deploy_carvel/package_repository/packages/concierge.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
@@ -1,10 +1,10 @@
 apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
-  name: concierge.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  name: concierge.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
 spec:
   refName: concierge.pinniped.dev
-  version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   releaseNotes: |
     Initial release of the pinniped concierge package, TODO: AUTOMATE THIS??
   valuesSchema:
@@ -160,7 +160,7 @@ spec:
     spec:
       fetch:
       - imgpkgBundle:
-          image: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          image: kind-registry.local:5000/test/build/test/build-package-concierge:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
       template:
       - ytt:
           paths:
diff --git a/deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml b/deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
similarity index 92%
rename from deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
rename to deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
index e00acc0f..e1603132 100644
--- a/deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
+++ b/deploy_carvel/package_repository/packages/local-user-authenticator.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
@@ -1,10 +1,10 @@
 apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
-  name: local-user-authenticator.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  name: local-user-authenticator.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
 spec:
   refName: local-user-authenticator.pinniped.dev
-  version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   releaseNotes: |
     Initial release of the local-user-authenticator package, TODO: AUTOMATE THIS??
   valuesSchema:
@@ -60,7 +60,7 @@ spec:
     spec:
       fetch:
       - imgpkgBundle:
-          image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          image: kind-registry.local:5000/test/build/test/build-package-local-user-authenticator:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
       template:
       - ytt:
           paths:
diff --git a/deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml b/deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
similarity index 98%
rename from deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
rename to deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
index 6ae8c717..d64f6591 100644
--- a/deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-F3326187-009A-4313-B188-1B454D1A7E04.yml
+++ b/deploy_carvel/package_repository/packages/supervisor.pinniped.dev/0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
@@ -1,10 +1,10 @@
 apiVersion: data.packaging.carvel.dev/v1alpha1
 kind: Package
 metadata:
-  name: supervisor.pinniped.dev.0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  name: supervisor.pinniped.dev.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
 spec:
   refName: supervisor.pinniped.dev
-  version: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+  version: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
   releaseNotes: |
     Initial release of the pinniped supervisor package, TODO: AUTOMATE THIS??
   valuesSchema:
@@ -169,7 +169,7 @@ spec:
     spec:
       fetch:
       - imgpkgBundle:
-          image: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+          image: kind-registry.local:5000/test/build/test/build-package-supervisor:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
       template:
       - ytt:
           paths:
diff --git a/deploy_carvel/packagerepository.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml b/deploy_carvel/packagerepository.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
new file mode 100644
index 00000000..6032738d
--- /dev/null
+++ b/deploy_carvel/packagerepository.0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D.yml
@@ -0,0 +1,10 @@
+---
+apiVersion: packaging.carvel.dev/v1alpha1
+kind: PackageRepository
+metadata:
+  name: "pinniped-package-repository"
+  namespace: "kapp-controller-packaging-global"
+spec:
+  fetch:
+    imgpkgBundle:
+      image: "kind-registry.local:5000/test/build/test/build-package-repository-pinniped:0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
diff --git a/deploy_carvel/supervisor-pkginstall.yml b/deploy_carvel/supervisor-pkginstall.yml
index 86caeebe..9de43f13 100644
--- a/deploy_carvel/supervisor-pkginstall.yml
+++ b/deploy_carvel/supervisor-pkginstall.yml
@@ -10,7 +10,7 @@ spec:
   packageRef:
     refName: "supervisor.pinniped.dev"
     versionSelection:
-      constraints: "0.0.0-F3326187-009A-4313-B188-1B454D1A7E04"
+      constraints: "0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D"
   values:
   - secretRef:
       name: "supervisor-package-install-secret"
@@ -27,7 +27,7 @@ stringData:
     namespace: supervisor
     api_group_suffix: pinniped.dev
     image_repo: kind-registry.local:5000/test/build
-    image_tag: 0.0.0-F3326187-009A-4313-B188-1B454D1A7E04
+    image_tag: 0.0.0-B0EC99E6-F598-42A9-8976-DFCE049C768D
     log_level: debug
 
     service_https_nodeport_port: 443
diff --git a/hack/build-carvel-packages.sh b/hack/build-carvel-packages.sh
index da493580..edd7fc03 100755
--- a/hack/build-carvel-packages.sh
+++ b/hack/build-carvel-packages.sh
@@ -134,7 +134,6 @@ do
   cp "deploy_carvel/${resource_name}/metadata.yml" "${package_repository_dir}/metadata.yml"
 done
 
-
 log_note "Generating .imgpkg/images.yml for  Pinniped PackageRepository bundle..."
 mkdir -p "deploy_carvel/package_repository/.imgpkg"
 kbld --file "deploy_carvel/package_repository/packages/" --imgpkg-lock-output "deploy_carvel/package_repository/.imgpkg/images.yml"
@@ -153,7 +152,9 @@ imgpkg pull --bundle "${package_repository_repo_tag}" --output "/tmp/${package_r
 
 log_note "deploying PackageRepository..."
 pinniped_package_repository_name="pinniped-package-repository"
-pinniped_package_repository_file="packagerepository.${pinniped_package_version}.yml" # TODO: deploy_carvel/ dir...
+# TODO: deploy_carvel/ dir...
+# TODO: delete the "extras", so perhaps put this in a "deploy_carvel/tmp/" dir that can be cleaned.
+pinniped_package_repository_file="deploy_carvel/packagerepository.${pinniped_package_version}.yml"
 echo -n "" > "${pinniped_package_repository_file}"
 cat <<EOT >> "${pinniped_package_repository_file}"
 ---