diff --git a/package.json b/package.json
index 27485e3..5f2235a 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "homepage": "https://circleci-public.github.io/visual-config-editor/",
   "dependencies": {
-    "@circleci/circleci-config-sdk": "0.6.0",
+    "@circleci/circleci-config-sdk": "0.7.0",
     "@craco/craco": "^6.3.0",
     "@monaco-editor/react": "^4.3.1",
     "@testing-library/jest-dom": "^5.11.4",
diff --git a/src/components/containers/inspector/JobInspector.tsx b/src/components/containers/inspector/JobInspector.tsx
index 212df61..2f677c1 100644
--- a/src/components/containers/inspector/JobInspector.tsx
+++ b/src/components/containers/inspector/JobInspector.tsx
@@ -12,6 +12,8 @@ const JobInspector = (
   props: FormikValues & { definitions: DefinitionModel },
 ) => {
   const navigateTo = useStoreActions((actions) => actions.navigateTo);
+  const executor = props.values.executor;
+  const executorName = typeof executor === 'string' ? executor : executor.name;
 
   return (
     <div>
@@ -20,6 +22,7 @@ const JobInspector = (
         label="Executor"
         as="select"
         name="executor.name"
+        value={executorName}
         required
       >
         {[{ name: 'Select Executor' }, ...props.definitions.executors].map(
diff --git a/src/mappings/ExecutorMapping.tsx b/src/mappings/ExecutorMapping.tsx
index c9dc1dd..651b1ed 100644
--- a/src/mappings/ExecutorMapping.tsx
+++ b/src/mappings/ExecutorMapping.tsx
@@ -80,7 +80,7 @@ const ExecutorMapping: ComponentMapping<
     const oldJob = nodeData.job;
 
     return new WorkflowJob(
-      new Job(oldJob.name, data, oldJob.steps),
+      new Job(oldJob.name, data.reuse(), oldJob.steps),
       nodeData.parameters,
     );
   },
diff --git a/yarn.lock b/yarn.lock
index 50c28f5..de4951a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1081,10 +1081,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@circleci/circleci-config-sdk@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@circleci/circleci-config-sdk/-/circleci-config-sdk-0.6.0.tgz#7374b92282a29aaef3efdf5868116f9034c39dcc"
-  integrity sha512-AHWL1h+nwZvqttjIDNsIaenJ5V0Gkc3bj9LCBv9dRJ2325T+XmntIauO5cy9JFYgv9v9GOXlpo/C6cFMHWjOAA==
+"@circleci/circleci-config-sdk@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@circleci/circleci-config-sdk/-/circleci-config-sdk-0.7.0.tgz#561584b8ab18fd9e92d40f357e5d3086d976fe9a"
+  integrity sha512-43+WMaMlmmwOJdhSCi7OELukCwkedskw8XLGFNHKR2kmH/ADEbeOurkB0wefZq9mOe9h2zpmnYRi1lYnIndpMQ==
   dependencies:
     ajv "^8.8.2"
     ajv-merge-patch "^5.0.1"