diff --git a/.changeset/famous-seals-serve.md b/.changeset/famous-seals-serve.md
deleted file mode 100644
index 0c07e387..00000000
--- a/.changeset/famous-seals-serve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kubernetes-agent": patch
----
-
-Forward merge from release/kubernetes-agent/v1 version `1.19.2`. Includes all changes in `1.19.2`
diff --git a/.changeset/strong-pears-end.md b/.changeset/strong-pears-end.md
deleted file mode 100644
index 34f963cc..00000000
--- a/.changeset/strong-pears-end.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"kubernetes-agent": patch
----
-
-Don't include an empty WorkerPools env var if not a worker
diff --git a/charts/kubernetes-agent/CHANGELOG.md b/charts/kubernetes-agent/CHANGELOG.md
index 7f03d97a..db6b71c2 100644
--- a/charts/kubernetes-agent/CHANGELOG.md
+++ b/charts/kubernetes-agent/CHANGELOG.md
@@ -1,5 +1,12 @@
 # kubernetes-agent
 
+## 2.8.2
+
+### Patch Changes
+
+- afb6307: Forward merge from release/kubernetes-agent/v1 version `1.19.2`. Includes all changes in `1.19.2`
+- 3f5398d: Don't include an empty WorkerPools env var if not a worker
+
 ## 2.8.1
 
 ### Patch Changes
diff --git a/charts/kubernetes-agent/Chart.yaml b/charts/kubernetes-agent/Chart.yaml
index 880d5f07..29afd341 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.8.1"
+version: "2.8.2"
 # This version number should be the same as the agent.image.tag value as this is the primary application version
 appVersion: "8.2.2514"
diff --git a/charts/kubernetes-agent/README.md b/charts/kubernetes-agent/README.md
index 90aec17d..e8207dd1 100644
--- a/charts/kubernetes-agent/README.md
+++ b/charts/kubernetes-agent/README.md
@@ -1,6 +1,6 @@
 ## Kubernetes agent
 
-![Version: 2.8.1](https://img.shields.io/badge/Version-2.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2514](https://img.shields.io/badge/AppVersion-8.2.2514-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.8.2](https://img.shields.io/badge/Version-2.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.2514](https://img.shields.io/badge/AppVersion-8.2.2514-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 7ff38ae8..1520605d 100644
--- a/charts/kubernetes-agent/package.json
+++ b/charts/kubernetes-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-agent",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "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 59fdcb97..3c39cd45 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.2.2514
-        helm.sh/chart: kubernetes-agent-2.8.1
+        helm.sh/chart: kubernetes-agent-2.8.2
       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 2432adb4..4ae67701 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.2.2514
-        helm.sh/chart: kubernetes-agent-2.8.1
+        helm.sh/chart: kubernetes-agent-2.8.2
       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 306e84ee..fa3b2a44 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.2.2514
-        helm.sh/chart: kubernetes-agent-2.8.1
+        helm.sh/chart: kubernetes-agent-2.8.2
       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.2.2514
-            helm.sh/chart: kubernetes-agent-2.8.1
+            helm.sh/chart: kubernetes-agent-2.8.2
         spec:
           affinity:
             nodeAffinity:
@@ -79,7 +79,7 @@ should match snapshot:
                 - name: OCTOPUS__K8STENTACLE__HELMRELEASENAME
                   value: RELEASE-NAME
                 - name: OCTOPUS__K8STENTACLE__HELMCHARTVERSION
-                  value: 2.8.1
+                  value: 2.8.2
                 - 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 e0fa3e30..60f154f7 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.2.2514
-        helm.sh/chart: kubernetes-agent-2.8.1
+        helm.sh/chart: kubernetes-agent-2.8.2
       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 5c7c7e4b..234f2747 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.2.2514
-        helm.sh/chart: kubernetes-agent-2.8.1
+        helm.sh/chart: kubernetes-agent-2.8.2
       name: octopus-agent-tentacle
       namespace: NAMESPACE