diff --git a/deploy_carvel/.gitignore b/deploy_carvel/.gitignore
index 94b9a4bc..fb55f463 100644
--- a/deploy_carvel/.gitignore
+++ b/deploy_carvel/.gitignore
@@ -4,3 +4,9 @@
 
 # installation artifacts will be generated here
 deploy_carvel/deploy/
+
+# images.yml files contain specific SHAs of images
+concierge/.imgpkg/images.yml
+supervisor/.imgpkg/images.yml
+local-user-authenticator/.imgpkg/images.yml
+package_repository/.imgpkg/images.yml
diff --git a/deploy_carvel/concierge/.imgpkg/images.yml b/deploy_carvel/concierge/.imgpkg/images.yml
deleted file mode 100644
index adc53f2c..00000000
--- a/deploy_carvel/concierge/.imgpkg/images.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: imgpkg.carvel.dev/v1alpha1
-images:
-- annotations:
-    kbld.carvel.dev/id: projects.registry.vmware.com/pinniped/pinniped-server:latest
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: latest
-          url: projects.registry.vmware.com/pinniped/pinniped-server:latest
-  image: projects.registry.vmware.com/pinniped/pinniped-server@sha256:a92183de893eb0b1850cc3a1d33306b96ba2cdb72a8a49c6493a58c01b4fa9cd
-kind: ImagesLock
diff --git a/deploy_carvel/local-user-authenticator/.imgpkg/images.yml b/deploy_carvel/local-user-authenticator/.imgpkg/images.yml
deleted file mode 100644
index adc53f2c..00000000
--- a/deploy_carvel/local-user-authenticator/.imgpkg/images.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: imgpkg.carvel.dev/v1alpha1
-images:
-- annotations:
-    kbld.carvel.dev/id: projects.registry.vmware.com/pinniped/pinniped-server:latest
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: latest
-          url: projects.registry.vmware.com/pinniped/pinniped-server:latest
-  image: projects.registry.vmware.com/pinniped/pinniped-server@sha256:a92183de893eb0b1850cc3a1d33306b96ba2cdb72a8a49c6493a58c01b4fa9cd
-kind: ImagesLock
diff --git a/deploy_carvel/pinniped-package-rbac-concierge-concierge-rbac.yml b/deploy_carvel/pinniped-package-rbac-concierge-concierge-rbac.yml
deleted file mode 100644
index bd79c4cd..00000000
--- a/deploy_carvel/pinniped-package-rbac-concierge-concierge-rbac.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "concierge-install-ns"
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: "pinniped-package-rbac-concierge-sa-superadmin-dangerous"
-  namespace: "concierge-install-ns"
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-concierge-role-superadmin-dangerous"
-  namespace: "concierge-install-ns"
-rules:
-- apiGroups: ["*"]
-  resources: ["*"]
-  verbs: ["*"]
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-concierge-role-binding-superadmin-dangerous"
-subjects:
-- kind: ServiceAccount
-  name: "pinniped-package-rbac-concierge-sa-superadmin-dangerous"
-  namespace: "concierge-install-ns"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: "pinniped-package-rbac-concierge-role-superadmin-dangerous"
-
diff --git a/deploy_carvel/pinniped-package-rbac-local-user-authenticator-local-user-authenticator-rbac.yml b/deploy_carvel/pinniped-package-rbac-local-user-authenticator-local-user-authenticator-rbac.yml
deleted file mode 100644
index b04a37c6..00000000
--- a/deploy_carvel/pinniped-package-rbac-local-user-authenticator-local-user-authenticator-rbac.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "local-user-authenticator-install-ns"
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: "pinniped-package-rbac-local-user-authenticator-sa-superadmin-dangerous"
-  namespace: "local-user-authenticator-install-ns"
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-local-user-authenticator-role-superadmin-dangerous"
-  namespace: "local-user-authenticator-install-ns"
-rules:
-- apiGroups: ["*"]
-  resources: ["*"]
-  verbs: ["*"]
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-local-user-authenticator-role-binding-superadmin-dangerous"
-subjects:
-- kind: ServiceAccount
-  name: "pinniped-package-rbac-local-user-authenticator-sa-superadmin-dangerous"
-  namespace: "local-user-authenticator-install-ns"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: "pinniped-package-rbac-local-user-authenticator-role-superadmin-dangerous"
-
diff --git a/deploy_carvel/pinniped-package-rbac-supervisor-supervisor-rbac.yml b/deploy_carvel/pinniped-package-rbac-supervisor-supervisor-rbac.yml
deleted file mode 100644
index d3ea042a..00000000
--- a/deploy_carvel/pinniped-package-rbac-supervisor-supervisor-rbac.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "supervisor-install-ns"
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: "pinniped-package-rbac-supervisor-sa-superadmin-dangerous"
-  namespace: "supervisor-install-ns"
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-supervisor-role-superadmin-dangerous"
-  namespace: "supervisor-install-ns"
-rules:
-- apiGroups: ["*"]
-  resources: ["*"]
-  verbs: ["*"]
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: "pinniped-package-rbac-supervisor-role-binding-superadmin-dangerous"
-subjects:
-- kind: ServiceAccount
-  name: "pinniped-package-rbac-supervisor-sa-superadmin-dangerous"
-  namespace: "supervisor-install-ns"
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: "pinniped-package-rbac-supervisor-role-superadmin-dangerous"
-
diff --git a/deploy_carvel/supervisor/.imgpkg/images.yml b/deploy_carvel/supervisor/.imgpkg/images.yml
deleted file mode 100644
index adc53f2c..00000000
--- a/deploy_carvel/supervisor/.imgpkg/images.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: imgpkg.carvel.dev/v1alpha1
-images:
-- annotations:
-    kbld.carvel.dev/id: projects.registry.vmware.com/pinniped/pinniped-server:latest
-    kbld.carvel.dev/origins: |
-      - resolved:
-          tag: latest
-          url: projects.registry.vmware.com/pinniped/pinniped-server:latest
-  image: projects.registry.vmware.com/pinniped/pinniped-server@sha256:a92183de893eb0b1850cc3a1d33306b96ba2cdb72a8a49c6493a58c01b4fa9cd
-kind: ImagesLock