diff --git a/.changeset/brown-actors-breathe.md b/.changeset/brown-actors-breathe.md
deleted file mode 100644
index 50af75d2..00000000
--- a/.changeset/brown-actors-breathe.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kubernetes-agent": patch
----
-
-Forward merge from release/kubernetes-agent/v1 version `1.16.1`. Includes all changes in `1.16.1`
diff --git a/charts/kubernetes-agent/CHANGELOG.md b/charts/kubernetes-agent/CHANGELOG.md
index 74b91f36..a5a8f2c0 100644
--- a/charts/kubernetes-agent/CHANGELOG.md
+++ b/charts/kubernetes-agent/CHANGELOG.md
@@ -1,5 +1,11 @@
 # kubernetes-agent
 
+## 2.2.1
+
+### Patch Changes
+
+- 175382f: Forward merge from release/kubernetes-agent/v1 version `1.16.1`. Includes all changes in `1.16.1`
+
 ## 2.2.0
 
 ### Minor Changes
diff --git a/charts/kubernetes-agent/Chart.yaml b/charts/kubernetes-agent/Chart.yaml
index c3a8151d..f649df98 100644
--- a/charts/kubernetes-agent/Chart.yaml
+++ b/charts/kubernetes-agent/Chart.yaml
@@ -9,6 +9,6 @@ maintainers:
     email: "support@octopus.com"
     url: "https://octopus.com"
 type: application
-version: "2.2.0"
+version: "2.2.1"
 # This version number should be the same as the agent.image.tag value as this is the primary application version
 appVersion: "8.1.2099"
diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md
index c0c9f4a5..00523f2c 100644
--- a/charts/kubernetes-agent/README.md
+++ b/charts/kubernetes-agent/README.md
@@ -1,6 +1,6 @@
 ## Kubernetes agent
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.1.2099](https://img.shields.io/badge/AppVersion-8.1.2099-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto)
+![Version: 2.2.1](https://img.shields.io/badge/Version-2.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.1.2099](https://img.shields.io/badge/AppVersion-8.1.2099-informational?style=flat-square) ![Octopus Deploy Version: 2024.2.6580+](https://img.shields.io/badge/Octopus_Deploy-2024.2.6580%2B-2F93E0?style=flat-square&logo=octopusdeploy&logoColor=%232F93E0&logoSize=auto)
 
 The Kubernetes agent is the recommended way to deploy to Kubernetes clusters using [Octopus Deploy](https://octopus.com).
 
diff --git a/charts/kubernetes-agent/package.json b/charts/kubernetes-agent/package.json
index 3b9b102d..9c60399e 100644
--- a/charts/kubernetes-agent/package.json
+++ b/charts/kubernetes-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-agent",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "private": true,
   "description": "The Octopus Kubernetes Agent",
   "author": "Octopus Deploy Ptd Ltd",
diff --git a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap
index d46bffb3..63507559 100644
--- a/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap
+++ b/charts/kubernetes-agent/tests/__snapshot__/auto-upgrader-serviceaccount_test.yaml.snap
@@ -9,6 +9,6 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 8.1.2099
-        helm.sh/chart: kubernetes-agent-2.2.0
+        helm.sh/chart: kubernetes-agent-2.2.1
       name: octopus-agent-auto-upgrader
       namespace: NAMESPACE
diff --git a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap
index f32d604d..3b425d69 100644
--- a/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap
+++ b/charts/kubernetes-agent/tests/__snapshot__/pod-serviceaccount_test.yaml.snap
@@ -9,6 +9,6 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 8.1.2099
-        helm.sh/chart: kubernetes-agent-2.2.0
+        helm.sh/chart: kubernetes-agent-2.2.1
       name: octopus-agent-scripts
       namespace: NAMESPACE
diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap
index fe38c0c8..69f1b719 100644
--- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap
+++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-deployment_test.yaml.snap
@@ -8,7 +8,7 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 8.1.2099
-        helm.sh/chart: kubernetes-agent-2.2.0
+        helm.sh/chart: kubernetes-agent-2.2.1
       name: octopus-agent-tentacle
       namespace: NAMESPACE
     spec:
@@ -24,7 +24,7 @@ should match snapshot:
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/name: octopus-agent
             app.kubernetes.io/version: 8.1.2099
-            helm.sh/chart: kubernetes-agent-2.2.0
+            helm.sh/chart: kubernetes-agent-2.2.1
         spec:
           affinity:
             nodeAffinity:
@@ -81,7 +81,7 @@ should match snapshot:
                 - name: OCTOPUS__K8STENTACLE__HELMRELEASENAME
                   value: RELEASE-NAME
                 - name: OCTOPUS__K8STENTACLE__HELMCHARTVERSION
-                  value: 2.2.0
+                  value: 2.2.1
                 - name: OCTOPUS__K8STENTACLE__DISABLEAUTOPODCLEANUP
                   value: "false"
                 - name: OCTOPUS__K8STENTACLE__DISABLEPODEVENTSINTASKLOG
diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap
index 82a6fa89..b092e69d 100644
--- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap
+++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-pvc_test.yaml.snap
@@ -8,7 +8,7 @@ should match snapshot when storageClassName is set:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 8.1.2099
-        helm.sh/chart: kubernetes-agent-2.2.0
+        helm.sh/chart: kubernetes-agent-2.2.1
       name: octopus-agent-RELEASE-NAME-pvc
     spec:
       accessModes:
diff --git a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap
index df73c43b..499a8979 100644
--- a/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap
+++ b/charts/kubernetes-agent/tests/__snapshot__/tentacle-serviceaccount_test.yaml.snap
@@ -9,6 +9,6 @@ should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: octopus-agent
         app.kubernetes.io/version: 8.1.2099
-        helm.sh/chart: kubernetes-agent-2.2.0
+        helm.sh/chart: kubernetes-agent-2.2.1
       name: octopus-agent-tentacle
       namespace: NAMESPACE