diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 546fa7f5..7a8591b3 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -21,7 +21,6 @@ aliases:
   srep-functional-team-hulk:
     - mrbarge
     - a7vicky
-    - bmeng
     - jwai7
     - rendhalver
     - ravitri
@@ -51,13 +50,13 @@ aliases:
     - jaybeeunix
     - wshearn
   srep-functional-team-thor:
-    - wanghaoran1988
+    - bmeng
     - MitaliBhalla
     - hectorakemp
-    - reetika-vyas
     - feichashao
     - supreeth7
     - Tafhim
+    - samanthajayasinghe
   srep-functional-team-v1alpha1:
     - iamkirkbater
     - AlexVulaj
@@ -69,12 +68,12 @@ aliases:
   srep-functional-leads:
     - mrbarge
     - rafael-azevedo
-    - wanghaoran1988
     - sam-nguyen7
     - iamkirkbater
     - bng0y
     - tonytheleg
     - karthikperu7
+    - bmeng
   srep-team-leads:
     - cblecker
     - jharrington22
@@ -83,6 +82,7 @@ aliases:
     - jewzaam
     - fahlmant
     - dustman9000
+    - wanghaoran1988
   srep-architects:
     - jewzaam
     - jharrington22
diff --git a/boilerplate/_data/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit
index e0f99157..ca319856 100644
--- a/boilerplate/_data/last-boilerplate-commit
+++ b/boilerplate/_data/last-boilerplate-commit
@@ -1 +1 @@
-4bf1a5962d62e50592542657e42c97f3092e962b
+92d91d47e2f3d37db4314c10a27ff3bfbade1848
diff --git a/boilerplate/_lib/freeze-check b/boilerplate/_lib/freeze-check
index 7fb18ec3..080629f5 100755
--- a/boilerplate/_lib/freeze-check
+++ b/boilerplate/_lib/freeze-check
@@ -35,7 +35,7 @@ BOILERPLATE_GIT_REPO=https://github.com/openshift/boilerplate.git
 # and reapply the diff? Messy and error-prone -- and I would be
 # seriously ticked off if something went wrong and lost my in-flight
 # changes.
-if ! [ -z "$(git status --porcelain)" ]; then
+if ! [ -z "$(git status --porcelain -- ':!build/Dockerfile*')" ]; then
   echo "Can't validate boilerplate in a dirty repository. Please commit your changes and try again." >&2
   exit 1
 fi
diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
index 546fa7f5..7a8591b3 100644
--- a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
+++ b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
@@ -21,7 +21,6 @@ aliases:
   srep-functional-team-hulk:
     - mrbarge
     - a7vicky
-    - bmeng
     - jwai7
     - rendhalver
     - ravitri
@@ -51,13 +50,13 @@ aliases:
     - jaybeeunix
     - wshearn
   srep-functional-team-thor:
-    - wanghaoran1988
+    - bmeng
     - MitaliBhalla
     - hectorakemp
-    - reetika-vyas
     - feichashao
     - supreeth7
     - Tafhim
+    - samanthajayasinghe
   srep-functional-team-v1alpha1:
     - iamkirkbater
     - AlexVulaj
@@ -69,12 +68,12 @@ aliases:
   srep-functional-leads:
     - mrbarge
     - rafael-azevedo
-    - wanghaoran1988
     - sam-nguyen7
     - iamkirkbater
     - bng0y
     - tonytheleg
     - karthikperu7
+    - bmeng
   srep-team-leads:
     - cblecker
     - jharrington22
@@ -83,6 +82,7 @@ aliases:
     - jewzaam
     - fahlmant
     - dustman9000
+    - wanghaoran1988
   srep-architects:
     - jewzaam
     - jharrington22
diff --git a/boilerplate/openshift/golang-osd-operator/standard.mk b/boilerplate/openshift/golang-osd-operator/standard.mk
index 06b55ad2..ebf907be 100644
--- a/boilerplate/openshift/golang-osd-operator/standard.mk
+++ b/boilerplate/openshift/golang-osd-operator/standard.mk
@@ -193,7 +193,7 @@ OPENAPI_GEN = openapi-gen
 .PHONY: op-generate
 ## CRD v1beta1 is no longer supported.
 op-generate:
-	cd ./api; $(CONTROLLER_GEN) crd:crdVersions=v1 paths=./... output:dir=$(PWD)/deploy/crds
+	cd ./api; $(CONTROLLER_GEN) crd:crdVersions=v1,generateEmbeddedObjectMeta=true paths=./... output:dir=$(PWD)/deploy/crds
 	cd ./api; $(CONTROLLER_GEN) object paths=./...
 
 .PHONY: openapi-generate
diff --git a/build/Dockerfile.olm-registry b/build/Dockerfile.olm-registry
index a9a89ade..629b703e 100644
--- a/build/Dockerfile.olm-registry
+++ b/build/Dockerfile.olm-registry
@@ -3,7 +3,7 @@ ARG SAAS_OPERATOR_DIR
 COPY ${SAAS_OPERATOR_DIR} manifests
 RUN initializer --permissive
 
-FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-1
+FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-3
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe