diff --git a/content/en/docs/contrib/troubleshooting.md b/content/en/docs/contrib/troubleshooting.md
index 740985f..227fb21 100644
--- a/content/en/docs/contrib/troubleshooting.md
+++ b/content/en/docs/contrib/troubleshooting.md
@@ -21,8 +21,8 @@ The error would look something like the following:
 
 ```console
 helm install spin-operator \
- --namespace spin-operator --create-namespace --version 0.5.0 --wait oci://ghcr.io/spinframework/charts/spin-operator
-Error: INSTALLATION FAILED: failed to download "oci://ghcr.io/spinframework/charts/spin-operator" at version "0.5.0"
+ --namespace spin-operator --create-namespace --version 0.6.0 --wait oci://ghcr.io/spinframework/charts/spin-operator
+Error: INSTALLATION FAILED: failed to download "oci://ghcr.io/spinframework/charts/spin-operator" at version "0.6.0"
 ```
 
 To fix, either re-authenticate with the registry with a valid token (e.g. `docker login ghcr.io`) or log out of the registry and pull the chart anonymously (e.g. `docker logout ghcr.io`).
@@ -30,11 +30,11 @@ To fix, either re-authenticate with the registry with a valid token (e.g. `docke
 ## No endpoints available for service "spin-operator-webhook-service"
 
 When following the quickstart guide the following error can occur when running the `kubectl apply -f
-https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml`
+https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml`
 command:
 
 ```console
-Error from server (InternalError): error when creating "https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml": Internal error occurred: failed calling webhook "mspinappexecutor.kb.io": failed to call webhook: Post "https://spin-operator-webhook-service.spin-operator.svc:443/mutate-core-spinkube-dev-v1alpha1-spinappexecutor?timeout=10s": no endpoints available for service "spin-operator-webhook-service"
+Error from server (InternalError): error when creating "https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml": Internal error occurred: failed calling webhook "mspinappexecutor.kb.io": failed to call webhook: Post "https://spin-operator-webhook-service.spin-operator.svc:443/mutate-core-spinkube-dev-v1alpha1-spinappexecutor?timeout=10s": no endpoints available for service "spin-operator-webhook-service"
 ```
 
 To address the error above, first look to see if Spin Operator is running:
@@ -80,13 +80,13 @@ To resolve this issue, please try to install the Spin Operator again. Except thi
 helm upgrade --install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 ```
 
 Once the Spin Operator is installed you can try and run the `kubectl apply -f
-https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml`
+https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml`
 command again. The issue should be resolved now.
 
 ## Error Validating Data: Connection Refused
diff --git a/content/en/docs/install/azure-kubernetes-service.md b/content/en/docs/install/azure-kubernetes-service.md
index b02e978..68be480 100644
--- a/content/en/docs/install/azure-kubernetes-service.md
+++ b/content/en/docs/install/azure-kubernetes-service.md
@@ -85,10 +85,10 @@ installed.
 
 ```shell
 # Install the CRDs
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 
 # Install the Runtime Class
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
 ```
 
 The following installs [cert-manager](https://github.com/cert-manager/cert-manager) which is
@@ -150,7 +150,7 @@ namespace:
 helm install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 ```
@@ -158,7 +158,7 @@ helm install spin-operator \
 Lastly, create the [shim executor]({{< ref "glossary#spin-app-executor-crd" >}})::
 
 ```console
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 ```
 
 ## Deploying a Spin App to AKS
diff --git a/content/en/docs/install/compatibility-matrices.md b/content/en/docs/install/compatibility-matrices.md
index 30a39b6..d3c8dbf 100644
--- a/content/en/docs/install/compatibility-matrices.md
+++ b/content/en/docs/install/compatibility-matrices.md
@@ -18,10 +18,11 @@ used, the application may not execute as expected. The following maps out the ve
 containerd shim](https://github.com/spinframework/containerd-shim-spin), Spin Operator, and `spin kube`
 plugin that have support for specific features.
 
-| Feature              | SpinApp field | Shim Version | Spin Operator Version | `spin kube` plugin version |
-| -------------------- | ------------- | ------------ | --------------------- | -------------------------- |
-| OTEL Traces          | `otel`        | v0.15.0      | v0.3.0                | NA                         |
-| Selective Deployment | `components`  | v0.17.0      | v0.4.0                | v0.3.0                     |
+| Feature              | SpinApp Field      | Shim Version | Spin Operator Version | `spin kube` Plugin Version |
+|----------------------|--------------------|--------------|-----------------------|----------------------------|
+| OTEL Traces          | `otel`             | v0.15.0      | v0.3.0                | NA                         |
+| Selective Deployment | `components`       | v0.17.0      | v0.4.0                | v0.3.0                     |
+| Invocation Limits    | `invocationLimits` | v0.20.0      | v0.6.0                | NA                         |
 
 > NA indicates that the feature in not available yet in that project
 
@@ -31,17 +32,17 @@ For tracking the availability of Spin features and compatibility of Spin SDKs, t
 indicates which versions of the Spin runtime the [Spin containerd
 shim](https://github.com/spinframework/containerd-shim-spin) uses.
 
-| Shim Version | Spin Version |
-|-------------|-------------|
-| **Spin v3.x** | |
-| *v0.19.0* | [Spin v3.2.0](https://github.com/fermyon/spin/releases/tag/v3.2.0) |
-| *v0.18.0* | [Spin v3.1.2](https://github.com/fermyon/spin/releases/tag/v3.1.2) |
-| *v0.17.0* | [Spin v3.0.0](https://github.com/fermyon/spin/releases/tag/v3.0.0) |
-| **Spin v2.x** | |
-| *v0.16.0* | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
-| *v0.15.1* | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
-| *v0.15.0* | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
-| *v0.14.1* | [Spin v2.4.3](https://github.com/fermyon/spin/releases/tag/v2.4.3) |
-| *v0.14.0* | [Spin v2.4.2](https://github.com/fermyon/spin/releases/tag/v2.4.2) |
-| *v0.13.0* | [Spin v2.3.1](https://github.com/fermyon/spin/releases/tag/v2.3.1) |
-| *v0.12.0* | [Spin v2.2.0](https://github.com/fermyon/spin/releases/tag/v2.2.0) |
+| Shim Version  | Spin Version                                                       |
+|---------------|--------------------------------------------------------------------|
+| **Spin v3.x** |                                                                    |
+| *v0.19.0*     | [Spin v3.2.0](https://github.com/fermyon/spin/releases/tag/v3.2.0) |
+| *v0.18.0*     | [Spin v3.1.2](https://github.com/fermyon/spin/releases/tag/v3.1.2) |
+| *v0.17.0*     | [Spin v3.0.0](https://github.com/fermyon/spin/releases/tag/v3.0.0) |
+| **Spin v2.x** |                                                                    |
+| *v0.16.0*     | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
+| *v0.15.1*     | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
+| *v0.15.0*     | [Spin v2.6.0](https://github.com/fermyon/spin/releases/tag/v2.6.0) |
+| *v0.14.1*     | [Spin v2.4.3](https://github.com/fermyon/spin/releases/tag/v2.4.3) |
+| *v0.14.0*     | [Spin v2.4.2](https://github.com/fermyon/spin/releases/tag/v2.4.2) |
+| *v0.13.0*     | [Spin v2.3.1](https://github.com/fermyon/spin/releases/tag/v2.3.1) |
+| *v0.12.0*     | [Spin v2.2.0](https://github.com/fermyon/spin/releases/tag/v2.2.0) |
diff --git a/content/en/docs/install/installing-with-helm.md b/content/en/docs/install/installing-with-helm.md
index a04cae3..ac7bf6b 100644
--- a/content/en/docs/install/installing-with-helm.md
+++ b/content/en/docs/install/installing-with-helm.md
@@ -62,7 +62,7 @@ here we install the defaults.
   representing Spin applications to be scheduled on the cluster.
 
 ```shell
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 - Next we create a [RuntimeClass]({{< ref "glossary#runtime-class" >}}) that points to the `spin`
@@ -70,7 +70,7 @@ kubectl apply -f https://github.com/spinframework/spin-operator/releases/downloa
   on a subset of nodes, you'll need to modify the RuntimeClass with a `nodeSelector:`:
 
 ```shell
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
 ```
 
 - Finally, we create a `containerd-spin-shim` [SpinAppExecutor]({{< ref
@@ -78,7 +78,7 @@ kubectl apply -f https://github.com/spinframework/spin-operator/releases/downloa
   just created to run Spin Apps:
 
 ```shell
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 ```
 
 ### Installing the Spin Operator Chart
@@ -90,7 +90,7 @@ The following installs the chart with the release name `spin-operator`:
 helm install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 ```
@@ -101,7 +101,7 @@ Note that you may also need to upgrade the spin-operator CRDs in tandem with upg
 release:
 
 ```shell
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 To upgrade the `spin-operator` release, run the following:
@@ -110,7 +110,7 @@ To upgrade the `spin-operator` release, run the following:
 # Upgrade Spin Operator using Helm
 helm upgrade spin-operator \
   --namespace spin-operator \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 ```
@@ -130,7 +130,7 @@ To completely uninstall all resources related to spin-operator, you may want to
 corresponding CRD resources and the RuntimeClass:
 
 ```shell
-kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
-kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
-kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
+kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
+kubectl delete -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
diff --git a/content/en/docs/install/microk8s.md b/content/en/docs/install/microk8s.md
index 5715813..5d08378 100644
--- a/content/en/docs/install/microk8s.md
+++ b/content/en/docs/install/microk8s.md
@@ -69,8 +69,8 @@ before proceeding.
 First, we need to apply a runtime class and a CRD for SpinKube:
 
 ```console { data-plausible="copy-quick-deploy-sample" }
-$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
-$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
+$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 Both of these should apply immediately.
@@ -90,7 +90,7 @@ $ microk8s kubectl annotate node --all kwasm.sh/kwasm-node=true
 Next, we need to install SpinKube’s operator using Helm (which is included with Microk8s).
 
 ```console { data-plausible="copy-quick-deploy-sample" }
-$ microk8s helm install spin-operator --namespace spin-operator --create-namespace --version 0.5.0 --wait oci://ghcr.io/spinframework/charts/spin-operator
+$ microk8s helm install spin-operator --namespace spin-operator --create-namespace --version 0.6.0 --wait oci://ghcr.io/spinframework/charts/spin-operator
 
 ```
 
@@ -98,7 +98,7 @@ Now we have the main operator installed. There is just one more step. We need to
 executor, which is a special CRD that allows us to use multiple executors for WebAssembly.
 
 ```console { data-plausible="copy-quick-deploy-sample" }
-$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+$ microk8s kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 
 ```
 
diff --git a/content/en/docs/install/quickstart.md b/content/en/docs/install/quickstart.md
index 1ba910a..bb80512 100644
--- a/content/en/docs/install/quickstart.md
+++ b/content/en/docs/install/quickstart.md
@@ -55,14 +55,14 @@ kubectl wait --for=condition=available --timeout=300s deployment/cert-manager-we
 > every node.
 
 ```console { data-plausible="copy-quick-apply-runtime-class" }
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
 ```
 
 4. Apply the [Custom Resource Definitions]({{< ref "glossary#custom-resource-definition-crd" >}})
    used by the Spin Operator:
 
 ```console { data-plausible="copy-quick-apply-crd" }
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 ## Deploy the Spin Operator
@@ -77,7 +77,7 @@ and pods are spinning up.
 helm install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 ```
@@ -85,7 +85,7 @@ helm install spin-operator \
 Lastly, create the [shim executor]({{< ref "glossary#spin-app-executor-crd" >}}):
 
 ```console { data-plausible="copy-quick-create-shim-executor" }
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 ```
 
 ## Run the Sample Application
diff --git a/content/en/docs/reference/spin-app.md b/content/en/docs/reference/spin-app.md
index 42dd748..7d292c6 100644
--- a/content/en/docs/reference/spin-app.md
+++ b/content/en/docs/reference/spin-app.md
@@ -132,6 +132,15 @@ cannot be defined if this is enabled. By default EnableAutoscaling is false.<br/
           ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling the image.<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>invocationLimits</b></td>
+        <td>map[string]string</td>
+        <td>
+          InvocationLimits define limits to be applied per invocation of the app.
+The keys are the names of the limits and the values are the limit values.
+SpinKube executors may define their own limits.<br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>podAnnotations</b></td>
         <td>map[string]string</td>
diff --git a/content/en/docs/topics/autoscaling/scaling-with-hpa.md b/content/en/docs/topics/autoscaling/scaling-with-hpa.md
index e50c67f..59b02b0 100644
--- a/content/en/docs/topics/autoscaling/scaling-with-hpa.md
+++ b/content/en/docs/topics/autoscaling/scaling-with-hpa.md
@@ -74,10 +74,10 @@ Next, run the following commands to install the Spin [Runtime Class]({{<ref
 
 ```console
 # Install the RuntimeClass
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
 
 # Install the CRDs
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 Lastly, install Spin Operator using `helm` and the [shim executor]({{< ref
@@ -88,12 +88,12 @@ Lastly, install Spin Operator using `helm` and the [shim executor]({{< ref
 helm install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 
 # Install the shim executor
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 ```
 
 Great, now you have Spin Operator up and running on your cluster. This means you’re set to create
diff --git a/content/en/docs/topics/autoscaling/scaling-with-keda.md b/content/en/docs/topics/autoscaling/scaling-with-keda.md
index aed158b..cd2fe4a 100644
--- a/content/en/docs/topics/autoscaling/scaling-with-keda.md
+++ b/content/en/docs/topics/autoscaling/scaling-with-keda.md
@@ -74,10 +74,10 @@ Next, run the following commands to install the Spin [Runtime Class]({{<ref
 
 ```console
 # Install the RuntimeClass
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.runtime-class.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.runtime-class.yaml
 
 # Install the CRDs
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.crds.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.crds.yaml
 ```
 
 Lastly, install Spin Operator using `helm` and the [shim executor]({{< ref
@@ -88,12 +88,12 @@ Lastly, install Spin Operator using `helm` and the [shim executor]({{< ref
 helm install spin-operator \
   --namespace spin-operator \
   --create-namespace \
-  --version 0.5.0 \
+  --version 0.6.0 \
   --wait \
   oci://ghcr.io/spinframework/charts/spin-operator
 
 # Install the shim executor
-kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.5.0/spin-operator.shim-executor.yaml
+kubectl apply -f https://github.com/spinframework/spin-operator/releases/download/v0.6.0/spin-operator.shim-executor.yaml
 ```
 
 Great, now you have Spin Operator up and running on your cluster. This means you’re set to create
diff --git a/crd-reference/generate.sh b/crd-reference/generate.sh
index cf3b7a3..4a029eb 100755
--- a/crd-reference/generate.sh
+++ b/crd-reference/generate.sh
@@ -9,7 +9,7 @@ script_dir=$(dirname "$0")
 
 cd $script_dir
 
-SPIN_OPERATOR_RELEASE=${SPIN_OPERATOR_RELEASE:-v0.5.0}
+SPIN_OPERATOR_RELEASE=${SPIN_OPERATOR_RELEASE:-v0.6.0}
 
 echo "Installing crdoc"
 go install fybrik.io/crdoc@latest