diff --git a/assets/rancher-webhook/rancher-webhook-2.0.6+up0.3.6-rc3.tgz b/assets/rancher-webhook/rancher-webhook-2.0.6+up0.3.6-rc3.tgz
deleted file mode 100644
index 18553fc228..0000000000
Binary files a/assets/rancher-webhook/rancher-webhook-2.0.6+up0.3.6-rc3.tgz and /dev/null differ
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/Chart.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/Chart.yaml
deleted file mode 100644
index 4cc403ef34..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-annotations:
-  catalog.cattle.io/certified: rancher
-  catalog.cattle.io/hidden: "true"
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.27.0-0'
-  catalog.cattle.io/namespace: cattle-system
-  catalog.cattle.io/os: linux
-  catalog.cattle.io/permits-os: linux,windows
-  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
-  catalog.cattle.io/release-name: rancher-webhook
-apiVersion: v2
-appVersion: 0.3.6-rc3
-dependencies:
-- condition: capi.enabled
-  name: capi
-  repository: ""
-description: ValidatingAdmissionWebhook for Rancher types
-name: rancher-webhook
-version: 2.0.6+up0.3.6-rc3
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/Chart.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/Chart.yaml
deleted file mode 100644
index 388210bef1..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/Chart.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v2
-appVersion: 0.0.0
-name: capi
-version: 0.0.0
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/templates/service.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/templates/service.yaml
deleted file mode 100644
index de7c255c4e..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/charts/capi/templates/service.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: webhook-service
-  annotations:
-    need-a-cert.cattle.io/secret-name: rancher-webhook-tls
-spec:
-  ports:
-  - name: https
-    port: 443
-    targetPort: {{ .Values.port | default 8777 }}
-  selector:
-    app: rancher-webhook
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/_helpers.tpl b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/_helpers.tpl
deleted file mode 100644
index c37a65c6f3..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/_helpers.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- define "system_default_registry" -}}
-{{- if .Values.global.cattle.systemDefaultRegistry -}}
-{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
-{{- else -}}
-{{- "" -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "rancher-webhook.labels" -}}
-app: rancher-webhook
-{{- end }}
-
-{{- define "linux-node-tolerations" -}}
-- key: "cattle.io/os"
-  value: "linux"
-  effect: "NoSchedule"
-  operator: "Equal"
-{{- end -}}
-
-{{- define "linux-node-selector" -}}
-kubernetes.io/os: linux
-{{- end -}}
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/deployment.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/deployment.yaml
deleted file mode 100644
index 13738feae0..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/deployment.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: rancher-webhook
-spec:
-  selector:
-    matchLabels:
-      app: rancher-webhook
-  template:
-    metadata:
-      labels:
-        app: rancher-webhook
-    spec:
-      {{- if .Values.capi.enabled }}
-      volumes:
-      - name: tls
-        secret:
-          secretName: rancher-webhook-tls
-      {{- end }}
-      {{- if .Values.global.hostNetwork }}
-      hostNetwork: true
-      {{- end }}
-      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
-      {{- if .Values.nodeSelector }}
-{{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end }}
-      tolerations: {{ include "linux-node-tolerations" . | nindent 6 }}
-      {{- if .Values.tolerations }}
-{{ toYaml .Values.tolerations | indent 6 }}
-      {{- end }}
-      containers:
-      - env:
-        - name: STAMP
-          value: "{{.Values.stamp}}"
-        - name: ENABLE_CAPI
-          value: "{{.Values.capi.enabled}}"
-        - name: ENABLE_MCM
-          value: "{{.Values.mcm.enabled}}"
-        - name: CATTLE_PORT
-          value: {{.Values.port | default 9443 | quote}}
-        - name: CATTLE_CAPI_PORT
-          value: {{.Values.capi.port | default 8777 | quote}}
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: '{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}'
-        name: rancher-webhook
-        imagePullPolicy: "{{ .Values.image.imagePullPolicy }}"
-        ports:
-        - name: https
-          containerPort: {{ .Values.port | default 9443 }}
-        - name: capi-https
-          containerPort: {{ .Values.capi.port | default 8777}}
-        startupProbe:
-          httpGet:
-            path: "/healthz"
-            port: "https"
-            scheme: "HTTPS"
-          failureThreshold: 60
-          periodSeconds: 5
-        livenessProbe:
-          httpGet:
-            path: "/healthz"
-            port: "https"
-            scheme: "HTTPS"
-          periodSeconds: 5
-        {{- if .Values.capi.enabled }}
-        volumeMounts:
-        - name: tls
-          mountPath: /tmp/k8s-webhook-server/serving-certs
-        {{- end }}
-        {{- if .Values.capNetBindService }}
-        securityContext:
-          capabilities:
-            add:
-            - NET_BIND_SERVICE 
-        {{- end }}
-      serviceAccountName: rancher-webhook
-      {{- if .Values.priorityClassName }}
-      priorityClassName: "{{.Values.priorityClassName}}"
-      {{- end }}
-      
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/rbac.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/rbac.yaml
deleted file mode 100644
index f4364995c0..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/rbac.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: rancher-webhook
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-- kind: ServiceAccount
-  name: rancher-webhook
-  namespace: {{.Release.Namespace}}
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/service.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/service.yaml
deleted file mode 100644
index 220afebeae..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/service.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: rancher-webhook
-  namespace: cattle-system
-spec:
-  ports:
-  - port: 443
-    targetPort: {{ .Values.port | default 9443 }}
-    protocol: TCP
-    name: https
-  selector:
-    app: rancher-webhook
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/serviceaccount.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/serviceaccount.yaml
deleted file mode 100644
index 9e7ad7e1fe..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: rancher-webhook
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: rancher-webhook-sudo
-  annotations:
-    cattle.io/description: "SA which can be impersonated to bypass rancher-webhook validation"
\ No newline at end of file
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/webhook.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/webhook.yaml
deleted file mode 100644
index 53a0687b6f..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/templates/webhook.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  name: rancher.cattle.io
----
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: rancher.cattle.io
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/README.md b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/README.md
deleted file mode 100644
index 6d3059a005..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-## local dev testing instructions
-
-Option 1: Full chart CI run with a live cluster
-
-```bash
-./scripts/charts/ci 
-```
-
-Option 2: Test runs against the chart only 
-
-```bash
-# install the helm plugin first - helm plugin install https://github.com/helm-unittest/helm-unittest.git
-bash dev-scripts/helm-unittest.sh
-```
-
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/capi-service_test.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/capi-service_test.yaml
deleted file mode 100644
index 4ee94a84a4..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/capi-service_test.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-suite: Test Service
-templates:
-  - charts/capi/templates/service.yaml
-tests:
-  - it: should set webhook default port values
-    set:
-      capi.enabled: true
-    asserts:
-      - equal:
-          path: spec.ports[0].targetPort
-          value: 8777
-
-  - it: should set updated target port
-    set:
-      capi.port: 2319
-      capi.enabled: true
-    asserts:
-      - equal:
-          path: spec.ports[0].targetPort
-          value: 2319
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/deployment_test.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/deployment_test.yaml
deleted file mode 100644
index 66a74d4e5f..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/deployment_test.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-suite: Test Deployment
-templates:
-  - deployment.yaml
-
-tests:
-  - it: should set webhook default port values
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].ports[0].containerPort
-          value: 9443
-      - equal:
-          path: spec.template.spec.containers[0].ports[1].containerPort
-          value: 8777
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: CATTLE_PORT
-            value: "9443"
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: CATTLE_CAPI_PORT
-            value: "8777"
-
-  - it: should set updated webhook port
-    set:
-      port: 2319
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].ports[0].containerPort
-          value: 2319
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: CATTLE_PORT
-            value: "2319"
-
-  - it: should set updated capi port
-    set:
-      capi.port: 2319
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].ports[1].containerPort
-          value: 2319
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: CATTLE_CAPI_PORT
-            value: "2319"
-
-  - it: should not set capabilities by default.
-    asserts:
-      - isNull:
-          path: spec.template.spec.containers[0].securityContext
-
-  - it: should set net capabilities when capNetBindService is true.
-    set:
-      capNetBindService: true
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].securityContext.capabilities.add
-          content: NET_BIND_SERVICE
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/service_test.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/service_test.yaml
deleted file mode 100644
index 03172ad033..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/tests/service_test.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-suite: Test Service
-templates:
-  - service.yaml
-
-tests:
-  - it: should set webhook default port values
-    asserts:
-      - equal:
-          path: spec.ports[0].targetPort
-          value: 9443
-
-  - it: should set updated target port
-    set:
-      port: 2319
-    asserts:
-      - equal:
-          path: spec.ports[0].targetPort
-          value: 2319
diff --git a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/values.yaml b/charts/rancher-webhook/2.0.6+up0.3.6-rc3/values.yaml
deleted file mode 100644
index 6eb1edfe78..0000000000
--- a/charts/rancher-webhook/2.0.6+up0.3.6-rc3/values.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-image:
-  repository: rancher/rancher-webhook
-  tag: v0.3.6-rc3
-  imagePullPolicy: IfNotPresent
-
-global:
-  cattle:
-    systemDefaultRegistry: ""
-  hostNetwork: false
-
-capi:
-  enabled: false
-  port: 8777
-
-mcm:
-  enabled: true
-
-# tolerations for the webhook deployment. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ for more info
-tolerations: []
-nodeSelector: {}
-
-## PriorityClassName assigned to deployment.
-priorityClassName: ""
-
-# port assigns which port to use when running rancher-webhook
-port: 9443
diff --git a/index.yaml b/index.yaml
index 9ef79bac5e..3ac70c82fe 100755
--- a/index.yaml
+++ b/index.yaml
@@ -14600,18 +14600,18 @@ entries:
       catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
       catalog.cattle.io/release-name: rancher-webhook
     apiVersion: v2
-    appVersion: 0.3.6-rc3
-    created: "2023-07-31T09:31:22.00688553-05:00"
+    appVersion: 0.3.6-rc4
+    created: "2023-08-03T12:18:30.788471-04:00"
     dependencies:
     - condition: capi.enabled
       name: capi
       repository: ""
     description: ValidatingAdmissionWebhook for Rancher types
-    digest: 0d55c24004c91d2172e0d36f35b91227d40bfd9b1db9ffa7b95e179b81c993fe
+    digest: 8c11d39b57726d21515d980e4672369a40f7c261a37d26a1e45138aeeeb19da1
     name: rancher-webhook
     urls:
-    - assets/rancher-webhook/rancher-webhook-2.0.6+up0.3.6-rc3.tgz
-    version: 2.0.6+up0.3.6-rc3
+    - assets/rancher-webhook/rancher-webhook-2.0.6+up0.3.6-rc4.tgz
+    version: 2.0.6+up0.3.6-rc4
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
diff --git a/release.yaml b/release.yaml
index 46b21ac9a8..910cffc0c6 100644
--- a/release.yaml
+++ b/release.yaml
@@ -12,16 +12,16 @@ epinio-crd:
 - 102.0.4+up1.9.0
 fleet:
 - 102.1.0+up0.7.0
-- 102.2.0+up0.8.0-rc.6
 - 102.1.1+up0.7.1-rc.1
+- 102.2.0+up0.8.0-rc.6
 fleet-agent:
 - 102.1.0+up0.7.0
-- 102.2.0+up0.8.0-rc.6
 - 102.1.1+up0.7.1-rc.1
+- 102.2.0+up0.8.0-rc.6
 fleet-crd:
 - 102.1.0+up0.7.0
-- 102.2.0+up0.8.0-rc.6
 - 102.1.1+up0.7.1-rc.1
+- 102.2.0+up0.8.0-rc.6
 prometheus-federator:
 - 0.3.0+up0.3.3
 rancher-backup: