diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d4f250c..004cb06 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,5 +10,5 @@ updates:
     ignore:
       - dependency-name: "app-sre/boilerplate"
         # don't upgrade boilerplate via these means
-      - dependency-name: "openshift/origin-operator-registry"
-        # don't upgrade origin-operator-registry via these means
+      - dependency-name: "openshift4/ose-operator-registry"
+        # don't upgrade ose-operator-registry via these means
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 546fa7f..b75ea61 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -21,7 +21,6 @@ aliases:
   srep-functional-team-hulk:
     - mrbarge
     - a7vicky
-    - bmeng
     - jwai7
     - rendhalver
     - ravitri
@@ -37,27 +36,27 @@ aliases:
     - Tessg22
     - thavlice
   srep-functional-team-rocket:
-    - anispate
-    - yithian
     - aliceh
+    - anispate
     - bdmiller3
+    - clcollins
     - mjlshen
-    - sam-nguyen7
     - tnierman
+    - yithian
   srep-functional-team-security:
     - karthikperu7
-    - clcollins
     - gsleeman
     - jaybeeunix
+    - sam-nguyen7
     - 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
+    - mjlshen
   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 e0f9915..89851c9 100644
--- a/boilerplate/_data/last-boilerplate-commit
+++ b/boilerplate/_data/last-boilerplate-commit
@@ -1 +1 @@
-4bf1a5962d62e50592542657e42c97f3092e962b
+851cc4a567773fdfa7c879f2f1f2bd97f6981d43
diff --git a/boilerplate/_lib/freeze-check b/boilerplate/_lib/freeze-check
index 7fb18ec..080629f 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/Dockerfile.olm-registry b/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry
index 11ce943..b120008 100644
--- a/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry
+++ b/boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry
@@ -1,9 +1,10 @@
-FROM quay.io/openshift/origin-operator-registry:4.12 AS builder
+FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 AS builder
 ARG SAAS_OPERATOR_DIR
 COPY ${SAAS_OPERATOR_DIR} manifests
 RUN initializer --permissive
 
-FROM registry.access.redhat.com/ubi8/ubi-micro:latest
+# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
diff --git a/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES b/boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES
index 546fa7f..b75ea61 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
@@ -37,27 +36,27 @@ aliases:
     - Tessg22
     - thavlice
   srep-functional-team-rocket:
-    - anispate
-    - yithian
     - aliceh
+    - anispate
     - bdmiller3
+    - clcollins
     - mjlshen
-    - sam-nguyen7
     - tnierman
+    - yithian
   srep-functional-team-security:
     - karthikperu7
-    - clcollins
     - gsleeman
     - jaybeeunix
+    - sam-nguyen7
     - 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
+    - mjlshen
   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/dependabot.yml b/boilerplate/openshift/golang-osd-operator/dependabot.yml
index d4f250c..004cb06 100644
--- a/boilerplate/openshift/golang-osd-operator/dependabot.yml
+++ b/boilerplate/openshift/golang-osd-operator/dependabot.yml
@@ -10,5 +10,5 @@ updates:
     ignore:
       - dependency-name: "app-sre/boilerplate"
         # don't upgrade boilerplate via these means
-      - dependency-name: "openshift/origin-operator-registry"
-        # don't upgrade origin-operator-registry via these means
+      - dependency-name: "openshift4/ose-operator-registry"
+        # don't upgrade ose-operator-registry via these means
diff --git a/boilerplate/openshift/golang-osd-operator/standard.mk b/boilerplate/openshift/golang-osd-operator/standard.mk
index 06b55ad..ebf907b 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 629b703..44763e8 100644
--- a/build/Dockerfile.olm-registry
+++ b/build/Dockerfile.olm-registry
@@ -1,9 +1,10 @@
-FROM quay.io/openshift/origin-operator-registry:4.12 AS builder
+FROM registry.redhat.io/openshift4/ose-operator-registry:v4.12 AS builder
 ARG SAAS_OPERATOR_DIR
 COPY ${SAAS_OPERATOR_DIR} manifests
 RUN initializer --permissive
 
-FROM registry.access.redhat.com/ubi8/ubi-micro:8.8-3
+# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
 
 COPY --from=builder /bin/registry-server /bin/registry-server
 COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe