diff --git a/README.md b/README.md
index 0ce51b59f..d5bf35556 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ CodeFlare Stack Compatibility Matrix
 
 | Component                    | Version                                                                                           |
 |------------------------------|---------------------------------------------------------------------------------------------------|
-| CodeFlare Operator           | [v1.6.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.6.0)             |
-| CodeFlare-SDK                | [v0.18.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.18.0)                |
-| AppWrapper                   | [v0.22.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.22.0)                   |
+| CodeFlare Operator           | [v1.7.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.7.0)             |
+| CodeFlare-SDK                | [v0.19.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.19.1)                |
+| AppWrapper                   | [v0.23.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.23.0)                   |
 | KubeRay                      | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0)                           |
 | Kueue                        | [v0.7.0](https://github.com/opendatahub-io/kueue/releases/tag/v0.7.0)                             |
 <!-- Compatibility Matrix end -->
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index e4f0687af..554ae2268 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -9,20 +9,22 @@ namespace: openshift-operators
 namePrefix: codeflare-operator-
 
 # Labels to add to all resources and selectors.
-commonLabels:
-  app.kubernetes.io/name: codeflare-operator
-  app.kubernetes.io/part-of: codeflare
-
-bases:
+labels:
+  - pairs:
+      app.kubernetes.io/name: codeflare-operator
+      app.kubernetes.io/part-of: codeflare
+    includeSelectors: true
+resources:
   - ../crd
   - ../rbac
   - ../manager
   - ../webhook
+  - metrics_service.yaml
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 # - ../prometheus
 
-resources:
-  - metrics_service.yaml
+# resources:
+#   - metrics_service.yaml
 
 patches:
   - path: manager_webhook_patch.yaml
diff --git a/config/e2e/kustomization.yaml b/config/e2e/kustomization.yaml
index 772370da6..6e8cdf4b7 100644
--- a/config/e2e/kustomization.yaml
+++ b/config/e2e/kustomization.yaml
@@ -1,6 +1,6 @@
 namespace: openshift-operators
 
-bases:
+resources:
 - config.yaml
 - ../default
 
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 847eca176..a87d335fe 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -11,11 +11,15 @@ configMapGenerator:
 configurations:
   - params.yaml
 
-vars:
-- name: codeflare_operator_controller_image
-  objref:
+replacements:
+- source:
     kind: ConfigMap
     name: stack-config
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.codeflare-operator-controller-image
+    version: v1
+    fieldPath: data.codeflare-operator-controller-image
+  targets:
+  - select:
+      kind: Deployment
+      name: manager
+    fieldPaths:
+    - spec.template.spec.containers.0.image
\ No newline at end of file
diff --git a/config/manager/params.env b/config/manager/params.env
index 351479ef6..2efa29e44 100644
--- a/config/manager/params.env
+++ b/config/manager/params.env
@@ -1,2 +1,2 @@
-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.6.0
+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.7.0
 namespace=opendatahub
diff --git a/config/scorecard/kustomization.yaml b/config/scorecard/kustomization.yaml
index 50cd2d084..a9a84a85a 100644
--- a/config/scorecard/kustomization.yaml
+++ b/config/scorecard/kustomization.yaml
@@ -1,6 +1,6 @@
 resources:
 - bases/config.yaml
-patchesJson6902:
+patches:
 - path: patches/basic.config.yaml
   target:
     group: scorecard.operatorframework.io
@@ -13,4 +13,4 @@ patchesJson6902:
     version: v1alpha3
     kind: Configuration
     name: config
-#+kubebuilder:scaffold:patchesJson6902
+#+kubebuilder:scaffold:patches