diff --git a/charts/worker-upgrade-v2/Chart.yaml b/charts/worker-upgrade-v2/Chart.yaml
index fd7bf2e..018cda9 100644
--- a/charts/worker-upgrade-v2/Chart.yaml
+++ b/charts/worker-upgrade-v2/Chart.yaml
@@ -9,6 +9,6 @@ maintainers:
     email: "support@octopus.com"
     url: "https://octopus.com"
 type: application
-version: "2.3.4"
+version: "2.3.5"
 # This version number should be the same as the agent.image.tag value as this is the primary application version
 appVersion: "8.2.2165"
diff --git a/charts/worker-upgrade-v2/value-migrations/to-v2.yaml b/charts/worker-upgrade-v2/value-migrations/to-v2.yaml
index c5eb477..9f6262f 100644
--- a/charts/worker-upgrade-v2/value-migrations/to-v2.yaml
+++ b/charts/worker-upgrade-v2/value-migrations/to-v2.yaml
@@ -22,11 +22,20 @@ agent:
       {{- end }}
   targetName: null
   targetEnvironments: null
+  {{- if .agent.defaultNamespace }}
   defaultNamespace: null
+  {{- end}}
   targetRoles: null
+  {{- if .agent.targetTenantTags }}
   targetTenantTags: null
+  {{- end}}
+  {{- if .agent.targetTenants }}
   targetTenants: null
+  {{- end}}
+  {{- if .agent.targetTenantedDeploymentParticipation }}
   targetTenantedDeploymentParticipation: null
-  scriptPods: null
-
-
+  {{- end}}
+  {{- if .agent.scriptPods.image }}
+  scriptPods:
+    image: null
+  {{- end}}