diff --git a/assets/f5/nginx-ingress-1.3.1.tgz b/assets/f5/nginx-ingress-1.3.1.tgz
new file mode 100644
index 000000000..3dc384213
Binary files /dev/null and b/assets/f5/nginx-ingress-1.3.1.tgz differ
diff --git a/assets/haproxy/haproxy-1.40.1.tgz b/assets/haproxy/haproxy-1.40.1.tgz
new file mode 100644
index 000000000..6105b35f1
Binary files /dev/null and b/assets/haproxy/haproxy-1.40.1.tgz differ
diff --git a/assets/linkerd/linkerd-control-plane-2024.6.4.tgz b/assets/linkerd/linkerd-control-plane-2024.6.4.tgz
index 0bdc8a037..b77161374 100644
Binary files a/assets/linkerd/linkerd-control-plane-2024.6.4.tgz and b/assets/linkerd/linkerd-control-plane-2024.6.4.tgz differ
diff --git a/assets/linkerd/linkerd-control-plane-2024.7.1.tgz b/assets/linkerd/linkerd-control-plane-2024.7.1.tgz
new file mode 100644
index 000000000..6ec116341
Binary files /dev/null and b/assets/linkerd/linkerd-control-plane-2024.7.1.tgz differ
diff --git a/assets/linkerd/linkerd-crds-2024.7.1.tgz b/assets/linkerd/linkerd-crds-2024.7.1.tgz
new file mode 100644
index 000000000..9c2757786
Binary files /dev/null and b/assets/linkerd/linkerd-crds-2024.7.1.tgz differ
diff --git a/charts/f5/nginx-ingress/Chart.yaml b/charts/f5/nginx-ingress/Chart.yaml
index c1c2247d2..e731a8966 100644
--- a/charts/f5/nginx-ingress/Chart.yaml
+++ b/charts/f5/nginx-ingress/Chart.yaml
@@ -4,10 +4,10 @@ annotations:
   catalog.cattle.io/kube-version: '>= 1.23.0-0'
   catalog.cattle.io/release-name: nginx-ingress
 apiVersion: v2
-appVersion: 3.6.0
+appVersion: 3.6.1
 description: NGINX Ingress Controller
 home: https://github.com/nginxinc/kubernetes-ingress
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.0/charts/nginx-ingress/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/charts/nginx-ingress/chart-icon.png
 keywords:
 - ingress
 - nginx
@@ -17,6 +17,6 @@ maintainers:
   name: nginxinc
 name: nginx-ingress
 sources:
-- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.0/charts/nginx-ingress
+- https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress
 type: application
-version: 1.3.0
+version: 1.3.1
diff --git a/charts/f5/nginx-ingress/README.md b/charts/f5/nginx-ingress/README.md
index 36ecbbdd5..c9990b61d 100644
--- a/charts/f5/nginx-ingress/README.md
+++ b/charts/f5/nginx-ingress/README.md
@@ -51,10 +51,10 @@ kubectl apply -f crds/
 Alternatively, CRDs can be upgraded without pulling the chart by running:
 
 ```console
-kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.0/deploy/crds.yaml
+kubectl apply -f https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/deploy/crds.yaml
 ```
 
-In the above command, `v3.6.0` represents the version of NGINX Ingress Controller release rather than the Helm chart version.
+In the above command, `v3.6.1` represents the version of NGINX Ingress Controller release rather than the Helm chart version.
 
 > **Note**
 >
@@ -87,14 +87,14 @@ To install the chart with the release name my-release (my-release is the name th
 For NGINX:
 
 ```console
-helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0
+helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1
 ```
 
 For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry
 `myregistry.example.com`)
 
 ```console
-helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
+helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
 ```
 
 This will install the latest `edge` version of the Ingress Controller from GitHub Container Registry. If you prefer to
@@ -109,7 +109,7 @@ CRDs](#upgrading-the-crds).
 To upgrade the release `my-release`:
 
 ```console
-helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.0
+helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 1.3.1
 ```
 
 ### Uninstalling the Chart
@@ -150,7 +150,7 @@ upgrading/deleting the CRDs.
 1. Pull the chart sources:
 
     ```console
-    helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.3.0
+    helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 1.3.1
     ```
 
 2. Change your working directory to nginx-ingress:
@@ -236,7 +236,7 @@ The steps you should follow depend on the Helm release name:
     Selector:               app=nginx-ingress-nginx-ingress
     ```
 
-2. Checkout the latest available tag using `git checkout v3.6.0`
+2. Checkout the latest available tag using `git checkout v3.6.1`
 
 3. Navigate to `/kubernates-ingress/charts/nginx-ingress`
 
@@ -288,7 +288,7 @@ reviewing its events:
     Selector:               app=<helm_release_name>-nginx-ingress
     ```
 
-2. Checkout the latest available tag using `git checkout v3.6.0`
+2. Checkout the latest available tag using `git checkout v3.6.1`
 
 3. Navigate to `/kubernates-ingress/charts/nginx-ingress`
 
@@ -355,7 +355,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |`controller.logLevel` | The log level of the Ingress Controller. | 1 |
 |`controller.image.digest` | The image digest of the Ingress Controller. | None |
 |`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress |
-|`controller.image.tag` | The tag of the Ingress Controller image. | 3.6.0 |
+|`controller.image.tag` | The tag of the Ingress Controller image. | 3.6.1 |
 |`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent |
 |`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} |
 |`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" |
@@ -386,7 +386,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |`controller.initContainerResources` | The resources of the init container which is used when `readOnlyRootFilesystem` is enabled by either setting `controller.securityContext.readOnlyRootFilesystem` or `controller.readOnlyRootFilesystem`to `true`. | requests: cpu=100m,memory=128Mi |
 |`controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1 |
 |`controller.ingressClass.name` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of Kubernetes. | nginx |
-|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.6.0, do not set the value to false. | true |
+|`controller.ingressClass.create` | Creates a new IngressClass object with the name `controller.ingressClass.name`. Set to `false` to use an existing ingressClass created using `kubectl` with the same name. If you use `helm upgrade`, do not change the values from the previous release as helm will delete IngressClass objects managed by helm. If you are upgrading from a release earlier than 3.6.1, do not set the value to false. | true |
 |`controller.ingressClass.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass.name`. Requires `controller.ingressClass.create`. | false |
 |`controller.watchNamespace` | Comma separated list of namespaces the Ingress Controller should watch for resources. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespaceLabel`. Please note that if configuring multiple namespaces using the Helm cli `--set` option, the string needs to wrapped in double quotes and the commas escaped using a backslash - e.g. `--set controller.watchNamespace="default\,nginx-ingress"`. | "" |
 |`controller.watchNamespaceLabel` | Configures the Ingress Controller to watch only those namespaces with label foo=bar. By default the Ingress Controller watches all namespaces. Mutually exclusive with `controller.watchNamespace`. | "" |
diff --git a/charts/f5/nginx-ingress/values-icp.yaml b/charts/f5/nginx-ingress/values-icp.yaml
index d973006e6..2776a7951 100644
--- a/charts/f5/nginx-ingress/values-icp.yaml
+++ b/charts/f5/nginx-ingress/values-icp.yaml
@@ -4,7 +4,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "3.6.0"
+    tag: "3.6.1"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true
diff --git a/charts/f5/nginx-ingress/values-plus.yaml b/charts/f5/nginx-ingress/values-plus.yaml
index f51a2347c..7eee8953b 100644
--- a/charts/f5/nginx-ingress/values-plus.yaml
+++ b/charts/f5/nginx-ingress/values-plus.yaml
@@ -3,4 +3,4 @@ controller:
   nginxplus: true
   image:
     repository: nginx-plus-ingress
-    tag: "3.6.0"
+    tag: "3.6.1"
diff --git a/charts/f5/nginx-ingress/values.schema.json b/charts/f5/nginx-ingress/values.schema.json
index 6c53cfe6b..bbee895e0 100644
--- a/charts/f5/nginx-ingress/values.schema.json
+++ b/charts/f5/nginx-ingress/values.schema.json
@@ -46,13 +46,13 @@
           "type": "object",
           "default": {},
           "title": "The selectorLabels Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector/properties/matchLabels"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector/properties/matchLabels"
         },
         "annotations": {
           "type": "object",
           "default": {},
           "title": "The annotations Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
         },
         "nginxplus": {
           "type": "boolean",
@@ -168,7 +168,7 @@
               "title": "Volumes for App Protect WAF v5",
               "items": {
                 "type": "object",
-                "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
+                "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
               }
             },
             "enforcer": {
@@ -228,7 +228,7 @@
                       "title": "The pullPolicy for the  App Protect WAF v5 Enforcer image",
                       "allOf": [
                         {
-                          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
+                          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
                         },
                         {
                           "enum": [
@@ -257,7 +257,7 @@
                   "type": "object",
                   "default": {},
                   "title": "The securityContext Schema",
-                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
+                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
                 }
               }
             },
@@ -302,7 +302,7 @@
                       "title": "The pullPolicy for the  App Protect WAF v5 Config Manager image",
                       "allOf": [
                         {
-                          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
+                          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
                         },
                         {
                           "enum": [
@@ -340,7 +340,7 @@
                     }
                   },
                   "title": "The securityContext Schema",
-                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
+                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
                 }
               }
             }
@@ -430,7 +430,7 @@
             "^.*$": {
               "anyOf": [
                 {
-                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/hostPort"
+                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/hostPort"
                 },
                 {
                   "type": "boolean"
@@ -446,7 +446,7 @@
           "title": "The containerPort Schema",
           "patternProperties": {
             "^.*$": {
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/containerPort"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/containerPort"
             }
           },
           "additionalProperties": false
@@ -455,7 +455,7 @@
           "type": "string",
           "allOf": [
             {
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/dnsPolicy"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/dnsPolicy"
             },
             {
               "enum": [
@@ -505,7 +505,7 @@
           "title": "The customPorts to expose on the NGINX Ingress Controller pod",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort"
           },
           "examples": [
             [
@@ -540,10 +540,10 @@
             },
             "tag": {
               "type": "string",
-              "default": "3.6.0",
+              "default": "3.6.1",
               "title": "The tag of the Ingress Controller image",
               "examples": [
-                "3.6.0"
+                "3.6.1"
               ]
             },
             "digest": {
@@ -560,7 +560,7 @@
               "title": "The pullPolicy for the Ingress Controller image",
               "allOf": [
                 {
-                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
+                  "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container/properties/imagePullPolicy"
                 },
                 {
                   "enum": [
@@ -580,7 +580,7 @@
           "examples": [
             {
               "repository": "nginx/nginx-ingress",
-              "tag": "3.6.0",
+              "tag": "3.6.1",
               "pullPolicy": "IfNotPresent"
             }
           ]
@@ -589,7 +589,7 @@
           "type": "object",
           "default": {},
           "title": "The lifecycle Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Lifecycle"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Lifecycle"
         },
         "customConfigMap": {
           "type": "string",
@@ -617,7 +617,7 @@
               "type": "object",
               "default": {},
               "title": "The annotations Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             },
             "entries": {
               "type": "object",
@@ -704,43 +704,43 @@
           "type": "object",
           "default": {},
           "title": "The nodeSelector Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/nodeSelector"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/nodeSelector"
         },
         "terminationGracePeriodSeconds": {
           "type": "integer",
           "default": 30,
           "title": "The terminationGracePeriodSeconds Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/terminationGracePeriodSeconds"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/terminationGracePeriodSeconds"
         },
         "podSecurityContext": {
           "type": "object",
           "default": {},
           "title": "The podSecurityContext Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSecurityContext"
         },
         "securityContext": {
           "type": "object",
           "default": {},
           "title": "The securityContext Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
         },
         "initContainerSecurityContext": {
           "type": "object",
           "default": {},
           "title": "The initContainerSecurityContext Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.SecurityContext"
         },
         "resources": {
           "type": "object",
           "default": {},
           "title": "The resources Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
         },
         "initContainerResources": {
           "type": "object",
           "default": {},
           "title": "The resources Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
         },
         "tolerations": {
           "type": "array",
@@ -748,20 +748,20 @@
           "title": "The tolerations Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
           }
         },
         "affinity": {
           "type": "object",
           "default": {},
           "title": "The affinity Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity"
         },
         "topologySpreadConstraints": {
           "type": "object",
           "default": {},
           "title": "The topologySpreadConstraints Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/topologySpreadConstraints"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/topologySpreadConstraints"
         },
         "env": {
           "type": "array",
@@ -769,7 +769,7 @@
           "title": "The env Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
           }
         },
         "volumes": {
@@ -778,7 +778,7 @@
           "title": "The volumes Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Volume"
           }
         },
         "volumeMounts": {
@@ -787,7 +787,7 @@
           "title": "The volumeMounts Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.VolumeMount"
           }
         },
         "initContainers": {
@@ -796,14 +796,14 @@
           "title": "The initContainers Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
           }
         },
         "minReadySeconds": {
           "type": "integer",
           "default": 0,
           "title": "The minReadySeconds Schema",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.apps.v1.DeploymentSpec/properties/minReadySeconds"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.apps.v1.DeploymentSpec/properties/minReadySeconds"
         },
         "strategy": {
           "type": "object",
@@ -811,7 +811,7 @@
           "title": "The strategy Schema",
           "allOf": [
             {
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.apps.v1.DeploymentStrategy"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.apps.v1.DeploymentStrategy"
             },
             {
               "properties": {
@@ -833,7 +833,7 @@
           "title": "The extraContainers Schema",
           "items": {
             "type": "object",
-            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
+            "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
           }
         },
         "replicaCount": {
@@ -1101,19 +1101,19 @@
               "type": "string",
               "default": "",
               "title": "The type",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/type"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/type"
             },
             "externalTrafficPolicy": {
               "type": "string",
               "default": "",
               "title": "The externalTrafficPolicy",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/externalTrafficPolicy"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/externalTrafficPolicy"
             },
             "annotations": {
               "type": "object",
               "default": {},
               "title": "The annotations",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             },
             "extraLabels": {
               "type": "object",
@@ -1129,13 +1129,13 @@
               "type": "string",
               "default": "",
               "title": "The loadBalancerIP",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/loadBalancerIP"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/loadBalancerIP"
             },
             "externalIPs": {
               "type": "array",
               "default": [],
               "title": "The externalIPs",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/externalIPs"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/externalIPs"
             },
             "loadBalancerSourceRanges": {
               "type": "array",
@@ -1150,13 +1150,13 @@
               "type": "boolean",
               "default": false,
               "title": "The allocateLoadBalancerNodePorts Schema",
-              "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/allocateLoadBalancerNodePorts"
+              "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/allocateLoadBalancerNodePorts"
             },
             "ipFamilyPolicy": {
               "type": "string",
               "default": "",
               "title": "The ipFamilyPolicy Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/ipFamilyPolicy",
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/ipFamilyPolicy",
               "examples": [
                 ""
               ]
@@ -1165,7 +1165,7 @@
               "type": "array",
               "default": [],
               "title": "The ipFamilies Schema",
-              "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/ipFamilies"
+              "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServiceSpec/properties/ipFamilies"
             },
             "httpPort": {
               "type": "object",
@@ -1269,7 +1269,7 @@
               "title": "The customPorts",
               "items": {
                 "type": "object",
-                "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.ServicePort"
+                "ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.ServicePort"
               }
             }
           },
@@ -1311,7 +1311,7 @@
               "type": "object",
               "default": {},
               "title": "The annotations Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             },
             "name": {
               "type": "string",
@@ -1456,7 +1456,7 @@
               "type": "object",
               "default": {},
               "title": "The annotations Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             }
           },
           "examples": [
@@ -1480,13 +1480,13 @@
               "type": "object",
               "default": {},
               "title": "The annotations Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             },
             "extraLabels": {
               "type": "object",
               "default": {},
               "title": "The extraLabels Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
             }
           },
           "examples": [
@@ -1500,7 +1500,7 @@
           "type": "string",
           "default": "",
           "title": "The priorityClassName",
-          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/priorityClassName"
+          "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.PodSpec/properties/priorityClassName"
         },
         "podDisruptionBudget": {
           "type": "object",
@@ -1517,13 +1517,13 @@
               "type": "object",
               "default": {},
               "title": "The annotations Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/annotations"
             },
             "minAvailable": {
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.policy.v1.PodDisruptionBudgetSpec/properties/minAvailable"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.policy.v1.PodDisruptionBudgetSpec/properties/minAvailable"
             },
             "maxUnavailable": {
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.policy.v1.PodDisruptionBudgetSpec/properties/maxUnavailable"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.policy.v1.PodDisruptionBudgetSpec/properties/maxUnavailable"
             }
           },
           "examples": [
@@ -1562,7 +1562,7 @@
             "initialDelaySeconds": {
               "type": "integer",
               "default": 0,
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Probe/properties/initialDelaySeconds"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.api.core.v1.Probe/properties/initialDelaySeconds"
             }
           },
           "examples": [
@@ -1670,7 +1670,7 @@
           "customPorts": [],
           "image": {
             "repository": "nginx/nginx-ingress",
-            "tag": "3.6.0",
+            "tag": "3.6.1",
             "digest": "",
             "pullPolicy": "IfNotPresent"
           },
@@ -1885,7 +1885,7 @@
               "type": "object",
               "default": {},
               "title": "The labels Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
             }
           }
         },
@@ -1907,13 +1907,13 @@
               "type": "object",
               "default": {},
               "title": "The labels Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta/properties/labels"
             },
             "selectorMatchLabels": {
               "type": "object",
               "default": {},
               "title": "The selectorMatchLabels Schema",
-              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector/properties/matchLabels"
+              "$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.30.2/_definitions.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector/properties/matchLabels"
             },
             "endpoints": {
               "type": "array",
@@ -2211,7 +2211,7 @@
         "customPorts": [],
         "image": {
           "repository": "nginx/nginx-ingress",
-          "tag": "3.6.0",
+          "tag": "3.6.1",
           "digest": "",
           "pullPolicy": "IfNotPresent"
         },
diff --git a/charts/f5/nginx-ingress/values.yaml b/charts/f5/nginx-ingress/values.yaml
index a3b888ab4..d111a3a20 100644
--- a/charts/f5/nginx-ingress/values.yaml
+++ b/charts/f5/nginx-ingress/values.yaml
@@ -134,7 +134,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag.
-    # tag: "3.6.0"
+    # tag: "3.6.1"
     ## The digest of the Ingress Controller image.
     ## If digest is specified it has precedence over tag and will be used instead
     # digest: "sha256:CHANGEME"
diff --git a/charts/haproxy/haproxy/Chart.yaml b/charts/haproxy/haproxy/Chart.yaml
index 10f2e5b31..1edb0b311 100644
--- a/charts/haproxy/haproxy/Chart.yaml
+++ b/charts/haproxy/haproxy/Chart.yaml
@@ -1,12 +1,13 @@
 annotations:
   artifacthub.io/changes: |
-    - Use Ingress Controller 3.0.0 version for base image
+    - Use Ingress Controller 3.0.1 version for base image
+    - Limit template spec name to 15 characters (#247)
   catalog.cattle.io/certified: partner
   catalog.cattle.io/display-name: HAProxy Kubernetes Ingress Controller
   catalog.cattle.io/kube-version: '>=1.23.0-0'
   catalog.cattle.io/release-name: haproxy
 apiVersion: v2
-appVersion: 3.0.0
+appVersion: 3.0.1
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 home: https://github.com/haproxytech/helm-charts/tree/main/kubernetes-ingress
 icon: https://raw.githubusercontent.com/haproxytech/helm-charts/main/kubernetes-ingress/chart-icon.png
@@ -21,4 +22,4 @@ name: haproxy
 sources:
 - https://github.com/haproxytech/kubernetes-ingress
 type: application
-version: 1.40.0
+version: 1.40.1
diff --git a/charts/haproxy/haproxy/templates/NOTES.txt b/charts/haproxy/haproxy/templates/NOTES.txt
index 54105c60c..ba3d01de6 100644
--- a/charts/haproxy/haproxy/templates/NOTES.txt
+++ b/charts/haproxy/haproxy/templates/NOTES.txt
@@ -29,7 +29,7 @@ Service ports mapped are:
     protocol: UDP
 {{- end }}
 {{- range .Values.controller.service.tcpPorts }}
-  - name: {{ .name }}-tcp
+  - name: {{ .name | trunc 15 | trimSuffix "-" }}
     containerPort: {{ .targetPort }}
     protocol: TCP
 {{- end }}
@@ -61,7 +61,7 @@ Service ports mapped are:
 {{- end }}
 {{- end }}
 {{- range .Values.controller.service.tcpPorts }}
-  - name: {{ .name }}-tcp
+  - name: {{ .name | trunc 15 | trimSuffix "-" }}
     containerPort: {{ .port }}
     protocol: TCP
 {{- if $useHostPort }}
diff --git a/charts/haproxy/haproxy/templates/controller-daemonset.yaml b/charts/haproxy/haproxy/templates/controller-daemonset.yaml
index 671a61bae..f969aafed 100644
--- a/charts/haproxy/haproxy/templates/controller-daemonset.yaml
+++ b/charts/haproxy/haproxy/templates/controller-daemonset.yaml
@@ -168,7 +168,7 @@ spec:
               {{- end }}
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .port }}
               protocol: TCP
               {{- if $useHostPort }}
diff --git a/charts/haproxy/haproxy/templates/controller-deployment.yaml b/charts/haproxy/haproxy/templates/controller-deployment.yaml
index 6653aecca..6375147ef 100644
--- a/charts/haproxy/haproxy/templates/controller-deployment.yaml
+++ b/charts/haproxy/haproxy/templates/controller-deployment.yaml
@@ -167,7 +167,7 @@ spec:
               protocol: UDP
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .targetPort }}
               protocol: TCP
           {{- end }}
diff --git a/charts/haproxy/haproxy/templates/controller-proxy-deployment.yaml b/charts/haproxy/haproxy/templates/controller-proxy-deployment.yaml
index 5a6b0021b..286e97856 100644
--- a/charts/haproxy/haproxy/templates/controller-proxy-deployment.yaml
+++ b/charts/haproxy/haproxy/templates/controller-proxy-deployment.yaml
@@ -162,7 +162,7 @@ spec:
               protocol: UDP
           {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
-            - name: {{ .name }}-tcp
+            - name: {{ .name | trunc 15 | trimSuffix "-" }}
               containerPort: {{ .targetPort }}
               protocol: TCP
           {{- end }}
diff --git a/charts/haproxy/haproxy/templates/controller-service.yaml b/charts/haproxy/haproxy/templates/controller-service.yaml
index efb20692e..eaa69a295 100644
--- a/charts/haproxy/haproxy/templates/controller-service.yaml
+++ b/charts/haproxy/haproxy/templates/controller-service.yaml
@@ -98,7 +98,7 @@ spec:
     {{- end }}
   {{- end }}
   {{- range .Values.controller.service.tcpPorts }}
-    - name: {{ .name }}-tcp
+    - name: {{ .name | trunc 15 | trimSuffix "-" }}
       port: {{ .port }}
       protocol: TCP
       targetPort: {{ .targetPort }}
diff --git a/charts/linkerd/linkerd-control-plane/Chart.yaml b/charts/linkerd/linkerd-control-plane/Chart.yaml
index de4c1eb51..7d7629fcd 100644
--- a/charts/linkerd/linkerd-control-plane/Chart.yaml
+++ b/charts/linkerd/linkerd-control-plane/Chart.yaml
@@ -6,7 +6,7 @@ annotations:
   catalog.cattle.io/kube-version: '>=1.22.0-0'
   catalog.cattle.io/release-name: linkerd-control-plane
 apiVersion: v2
-appVersion: edge-24.6.4
+appVersion: edge-24.7.1
 dependencies:
 - name: partials
   repository: file://./charts/partials
@@ -26,4 +26,4 @@ name: linkerd-control-plane
 sources:
 - https://github.com/linkerd/linkerd2/
 type: application
-version: 2024.6.4
+version: 2024.7.1
diff --git a/charts/linkerd/linkerd-control-plane/README.md b/charts/linkerd/linkerd-control-plane/README.md
index 26527216b..e9d956752 100644
--- a/charts/linkerd/linkerd-control-plane/README.md
+++ b/charts/linkerd/linkerd-control-plane/README.md
@@ -3,7 +3,7 @@
 Linkerd gives you observability, reliability, and security
 for your microservices — with no code change required.
 
-![Version: 2024.6.4](https://img.shields.io/badge/Version-2024.6.4-informational?style=flat-square)
+![Version: 2024.7.1](https://img.shields.io/badge/Version-2024.7.1-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 
diff --git a/charts/linkerd/linkerd-control-plane/values.yaml b/charts/linkerd/linkerd-control-plane/values.yaml
index f708977f8..daca74d87 100644
--- a/charts/linkerd/linkerd-control-plane/values.yaml
+++ b/charts/linkerd/linkerd-control-plane/values.yaml
@@ -24,7 +24,7 @@ controlPlaneTracing: false
 # -- namespace to send control plane traces to
 controlPlaneTracingNamespace: linkerd-jaeger
 # -- control plane version. See Proxy section for proxy version
-linkerdVersion: edge-24.6.4
+linkerdVersion: edge-24.7.1
 # -- default kubernetes deployment strategy
 deploymentStrategy:
   rollingUpdate:
diff --git a/charts/linkerd/linkerd-crds/Chart.yaml b/charts/linkerd/linkerd-crds/Chart.yaml
index 603611f9f..19cf0b459 100644
--- a/charts/linkerd/linkerd-crds/Chart.yaml
+++ b/charts/linkerd/linkerd-crds/Chart.yaml
@@ -23,4 +23,4 @@ name: linkerd-crds
 sources:
 - https://github.com/linkerd/linkerd2/
 type: application
-version: 2024.6.4
+version: 2024.7.1
diff --git a/charts/linkerd/linkerd-crds/README.md b/charts/linkerd/linkerd-crds/README.md
index d16c20d2f..67f0325cf 100644
--- a/charts/linkerd/linkerd-crds/README.md
+++ b/charts/linkerd/linkerd-crds/README.md
@@ -3,7 +3,7 @@
 Linkerd gives you observability, reliability, and security
 for your microservices — with no code change required.
 
-![Version: 2024.6.4](https://img.shields.io/badge/Version-2024.6.4-informational?style=flat-square)
+![Version: 2024.7.1](https://img.shields.io/badge/Version-2024.7.1-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 **Homepage:** <https://linkerd.io>
diff --git a/charts/linkerd/linkerd-crds/templates/workload/external-workload.yaml b/charts/linkerd/linkerd-crds/templates/workload/external-workload.yaml
index a60aff48b..715e779aa 100644
--- a/charts/linkerd/linkerd-crds/templates/workload/external-workload.yaml
+++ b/charts/linkerd/linkerd-crds/templates/workload/external-workload.yaml
@@ -17,7 +17,6 @@ spec:
     listKind: ExternalWorkloadList
     plural: externalworkloads
     singular: externalworkload
-    shortNames: []
   scope: Namespaced
   versions:
   - name: v1alpha1
diff --git a/index.yaml b/index.yaml
index 8c3a18363..6310e63d3 100644
--- a/index.yaml
+++ b/index.yaml
@@ -11579,6 +11579,35 @@ entries:
     - assets/gopaddle/gopaddle-4.2.7.tgz
     version: 4.2.7
   haproxy:
+  - annotations:
+      artifacthub.io/changes: |
+        - Use Ingress Controller 3.0.1 version for base image
+        - Limit template spec name to 15 characters (#247)
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: HAProxy Kubernetes Ingress Controller
+      catalog.cattle.io/kube-version: '>=1.23.0-0'
+      catalog.cattle.io/release-name: haproxy
+    apiVersion: v2
+    appVersion: 3.0.1
+    created: "2024-07-05T00:56:33.847500644Z"
+    description: A Helm chart for HAProxy Kubernetes Ingress Controller
+    digest: fdaa48cca884617df321be97bc9a8c92b344f76c7e23fe385bab10c3bc7c0c5d
+    home: https://github.com/haproxytech/helm-charts/tree/main/kubernetes-ingress
+    icon: https://raw.githubusercontent.com/haproxytech/helm-charts/main/kubernetes-ingress/chart-icon.png
+    keywords:
+    - ingress
+    - haproxy
+    kubeVersion: '>=1.23.0-0'
+    maintainers:
+    - email: dkorunic@haproxy.com
+      name: Dinko Korunic
+    name: haproxy
+    sources:
+    - https://github.com/haproxytech/kubernetes-ingress
+    type: application
+    urls:
+    - assets/haproxy/haproxy-1.40.1.tgz
+    version: 1.40.1
   - annotations:
       artifacthub.io/changes: |
         - Use Ingress Controller 3.0.0 version for base image
@@ -19246,17 +19275,49 @@ entries:
       catalog.cattle.io/kube-version: '>=1.22.0-0'
       catalog.cattle.io/release-name: linkerd-control-plane
     apiVersion: v2
-    appVersion: edge-24.6.4
-    created: "2024-07-02T21:24:06.179282377Z"
+    appVersion: edge-24.7.1
+    created: "2024-07-05T00:56:40.478493527Z"
     dependencies:
     - name: partials
       repository: file://./charts/partials
       version: 0.1.0
     description: 'Linkerd gives you observability, reliability, and security for your
       microservices — with no code change required. '
-    digest: 41cc3c4e19ff46cf4aa1bd31c4709df5e7d926b473deeed79e5eb77c9823b9be
+    digest: 295e8789d7988d5142d4fb15b92c3b802e6017b410dd47f0b03c8710051de501
     home: https://linkerd.io
-    icon: file://assets/icons/linkerd-control-plane.png
+    icon: https://linkerd.io/images/logo-only-200h.png
+    keywords:
+    - service-mesh
+    kubeVersion: '>=1.22.0-0'
+    maintainers:
+    - email: cncf-linkerd-dev@lists.cncf.io
+      name: Linkerd authors
+      url: https://linkerd.io/
+    name: linkerd-control-plane
+    sources:
+    - https://github.com/linkerd/linkerd2/
+    type: application
+    urls:
+    - assets/linkerd/linkerd-control-plane-2024.7.1.tgz
+    version: 2024.7.1
+  - annotations:
+      catalog.cattle.io/auto-install: linkerd-crds
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Linkerd Control Plane
+      catalog.cattle.io/kube-version: '>=1.22.0-0'
+      catalog.cattle.io/release-name: linkerd-control-plane
+    apiVersion: v2
+    appVersion: edge-24.6.4
+    created: "2024-07-05T00:56:35.59457078Z"
+    dependencies:
+    - name: partials
+      repository: file://./charts/partials
+      version: 0.1.0
+    description: 'Linkerd gives you observability, reliability, and security for your
+      microservices — with no code change required. '
+    digest: 053923aae207a6d9dd6aa27e023a2c814d2e336d197603e018e027036c0a1540
+    home: https://linkerd.io
+    icon: https://linkerd.io/images/logo-only-200h.png
     keywords:
     - service-mesh
     kubeVersion: '>=1.22.0-0'
@@ -20093,6 +20154,36 @@ entries:
     - assets/linkerd/linkerd-control-plane-1.12.5.tgz
     version: 1.12.5
   linkerd-crds:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: Linkerd CRDs
+      catalog.cattle.io/kube-version: '>=1.22.0-0'
+      catalog.cattle.io/release-name: linkerd-crds
+    apiVersion: v2
+    created: "2024-07-05T00:56:40.532604123Z"
+    dependencies:
+    - name: partials
+      repository: file://./charts/partials
+      version: 0.1.0
+    description: 'Linkerd gives you observability, reliability, and security for your
+      microservices — with no code change required. '
+    digest: 4e001f9e275c8ae45fb6bc36473f1269f3c7d5dffafa3bb4c450b81b3bb43512
+    home: https://linkerd.io
+    icon: https://linkerd.io/images/logo-only-200h.png
+    keywords:
+    - service-mesh
+    kubeVersion: '>=1.22.0-0'
+    maintainers:
+    - email: cncf-linkerd-dev@lists.cncf.io
+      name: Linkerd authors
+      url: https://linkerd.io/
+    name: linkerd-crds
+    sources:
+    - https://github.com/linkerd/linkerd2/
+    type: application
+    urls:
+    - assets/linkerd/linkerd-crds-2024.7.1.tgz
+    version: 2024.7.1
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: Linkerd CRDs
@@ -21992,6 +22083,32 @@ entries:
     - assets/nats/nats-0.19.15.tgz
     version: 0.19.15
   nginx-ingress:
+  - annotations:
+      catalog.cattle.io/certified: partner
+      catalog.cattle.io/display-name: NGINX Ingress Controller
+      catalog.cattle.io/kube-version: '>= 1.23.0-0'
+      catalog.cattle.io/release-name: nginx-ingress
+    apiVersion: v2
+    appVersion: 3.6.1
+    created: "2024-07-05T00:56:33.667747259Z"
+    description: NGINX Ingress Controller
+    digest: bff301cf3a5601035fb5dd201f87498d644ad62cdf2c4c5237e11ada03540db6
+    home: https://github.com/nginxinc/kubernetes-ingress
+    icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.6.1/charts/nginx-ingress/chart-icon.png
+    keywords:
+    - ingress
+    - nginx
+    kubeVersion: '>= 1.23.0-0'
+    maintainers:
+    - email: kubernetes@nginx.com
+      name: nginxinc
+    name: nginx-ingress
+    sources:
+    - https://github.com/nginxinc/kubernetes-ingress/tree/v3.6.1/charts/nginx-ingress
+    type: application
+    urls:
+    - assets/f5/nginx-ingress-1.3.1.tgz
+    version: 1.3.1
   - annotations:
       catalog.cattle.io/certified: partner
       catalog.cattle.io/display-name: NGINX Ingress Controller