diff --git a/app/containers/run/route.js b/app/containers/run/route.js
index 999f41ba9..eb22b6387 100644
--- a/app/containers/run/route.js
+++ b/app/containers/run/route.js
@@ -77,6 +77,21 @@ export default Route.extend({
     }
 
     const clone = _workload.clone();
+    
+    if ( !params.upgrade ) {
+      delete clone['workloadAnnotations'];
+      delete clone['workloadLabels'];
+      delete clone['publicEndpoints'];
+      if ( clone.labels ) {
+        delete clone.labels['workload.user.cattle.io/workloadselector'];
+      }
+      if ( clone.selector && clone.selector.matchLabels) {
+        delete clone.selector.matchLabels['workload.user.cattle.io/workloadselector'];
+        if ( !Object.keys(clone.selector.matchLabels).length ) {
+          delete clone.selector['matchLabels'];
+        }
+      }
+    }
 
     const containerNames = clone.containers.map(x => get(x, 'name'));
     let containerName = null;