diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index 01eb8a8f1..5a7ffbcf0 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -30,6 +30,7 @@ import {AppsModule} from './apps/apps.module';
 import {UrlUtilities} from './url-utilities.service';
 import {TaskService} from './shared/api/task.service';
 import {JobService} from './shared/api/job.service';
+import {DevModule} from './dev/dev.module';
 
 @NgModule({
   declarations: [AppComponent],
@@ -44,7 +45,7 @@ import {JobService} from './shared/api/job.service';
     FormsModule,
     LayoutModule,
     // DashboardModule,
-    // DevModule,
+    DevModule,
     StreamsModule,
     TasksJobsModule,
     ManageModule,
diff --git a/ui/src/app/apps/add/register/register.component.html b/ui/src/app/apps/add/register/register.component.html
index b39667ceb..9dc886265 100644
--- a/ui/src/app/apps/add/register/register.component.html
+++ b/ui/src/app/apps/add/register/register.component.html
@@ -48,32 +48,6 @@
             </div>
           </div>
         </div>
-        <div
-          class="clr-form-control clr-row"
-          [class.clr-error]="submitted && form.get('bootVersion').invalid && !isFormEmpty(form)"
-        >
-          <label class="clr-col-2 clr-control-label" for="type{{ i }}">{{
-            'applications.main.bootVersion' | translate
-          }}</label>
-          <div class="clr-control-container clr-col-10" *ngIf="bootVersions">
-            <div class="clr-select-wrapper">
-              <select
-                name="bootVersion{{ i }}"
-                id="bootVersion{{ i }}"
-                formControlName="bootVersion"
-                class="clr-select"
-              >
-                <option *ngFor="let bootVersionKey of bootVersions" value="{{ bootVersionKey }}">
-                  Spring Boot&nbsp;
-                  {{ 'applications.main.bootVersions.' + bootVersionKey | translate }}
-                </option>
-              </select>
-            </div>
-            <div class="clr-subtext" *ngIf="submitted && form.get('type').invalid && !isFormEmpty(form)">
-              {{ 'applications.add.register.invalidType' | translate }}
-            </div>
-          </div>
-        </div>
         <div
           class="clr-form-control clr-row"
           [class.clr-error]="submitted && form.get('uri').invalid && !isFormEmpty(form)"
diff --git a/ui/src/app/apps/add/register/register.component.spec.ts b/ui/src/app/apps/add/register/register.component.spec.ts
index 24a0ff36e..12fbbe773 100644
--- a/ui/src/app/apps/add/register/register.component.spec.ts
+++ b/ui/src/app/apps/add/register/register.component.spec.ts
@@ -70,9 +70,9 @@ describe('apps/register/register.component.ts', () => {
     const navigate = spyOn((<any>component).router, 'navigateByUrl');
     fixture.detectChanges();
     const tests = [
-      {name: 'foobar1', type: 'source', uri: 'https://foo.bar', metaDataUri: '', bootVersion: '3', force: false},
-      {name: '', type: '', uri: '', metaDataUri: '', bootVersion: '2', force: false},
-      {name: '', type: '', uri: '', metaDataUri: '', bootVersion: '2', force: false}
+      {name: 'foobar1', type: 'source', uri: 'https://foo.bar', metaDataUri: '', force: false},
+      {name: '', type: '', uri: '', metaDataUri: '', force: false},
+      {name: '', type: '', uri: '', metaDataUri: '', force: false}
     ];
     component.newForm();
     component.newForm();
@@ -80,7 +80,6 @@ describe('apps/register/register.component.ts', () => {
       component.forms[index].get('name').setValue(test.name);
       component.forms[index].get('type').setValue(test.type);
       component.forms[index].get('uri').setValue(test.uri);
-      component.forms[index].get('bootVersion').setValue(test.bootVersion);
       component.forms[index].get('metaDataUri').setValue(test.metaDataUri);
       component.forms[index].get('force').setValue(test.force);
     });
@@ -108,9 +107,9 @@ describe('apps/register/register.component.ts', () => {
   it('should display errors form', () => {
     fixture.detectChanges();
     const tests = [
-      {name: 'foobar1', type: 'source', uri: 'https://foo.bar', metaDataUri: '', bootVersion: '3', force: false},
-      {name: 'foobar2', type: 'sink', uri: 'https://foo.bar', metaDataUri: '', bootVersion: '2', force: false},
-      {name: 'foobar3', type: 'processor', uri: '', metaDataUri: '', bootVersion: '3', force: false}
+      {name: 'foobar1', type: 'source', uri: 'https://foo.bar', metaDataUri: '', force: false},
+      {name: 'foobar2', type: 'sink', uri: 'https://foo.bar', metaDataUri: '', force: false},
+      {name: 'foobar3', type: 'processor', uri: '', metaDataUri: '', force: false}
     ];
     component.newForm();
     component.newForm();
@@ -118,7 +117,6 @@ describe('apps/register/register.component.ts', () => {
       component.forms[index].get('name').setValue(test.name);
       component.forms[index].get('type').setValue(test.type);
       component.forms[index].get('uri').setValue(test.uri);
-      component.forms[index].get('bootVersion').setValue(test.bootVersion);
       component.forms[index].get('metaDataUri').setValue(test.metaDataUri);
       component.forms[index].get('force').setValue(test.force);
     });
@@ -137,13 +135,11 @@ describe('apps/register/register.component.ts', () => {
       type: 'source',
       uri: 'https://foo.bar',
       metaDataUri: '',
-      bootVersion: '3',
       force: false
     };
     component.forms[0].get('name').setValue(test.name);
     component.forms[0].get('type').setValue(test.type);
     component.forms[0].get('uri').setValue(test.uri);
-    component.forms[0].get('bootVersion').setValue(test.bootVersion);
     component.forms[0].get('metaDataUri').setValue(test.metaDataUri);
     component.forms[0].get('force').setValue(test.force);
     fixture.detectChanges();
diff --git a/ui/src/app/apps/add/register/register.component.ts b/ui/src/app/apps/add/register/register.component.ts
index cfeffaec8..9a4ba4f59 100644
--- a/ui/src/app/apps/add/register/register.component.ts
+++ b/ui/src/app/apps/add/register/register.component.ts
@@ -59,7 +59,6 @@ export class RegisterComponent implements OnInit {
               type: form.get('type').value as ApplicationType,
               uri: form.get('uri').value,
               metaDataUri: form.get('metaDataUri').value,
-              bootVersion: form.get('bootVersion').value,
               force: form.get('force').value
             };
           }
@@ -109,8 +108,7 @@ export class RegisterComponent implements OnInit {
       form.get('uri').hasError('required') &&
       form.get('name').hasError('required') &&
       form.get('metaDataUri').value === '' &&
-      form.get('type').hasError('required') &&
-      form.get('bootVersion').value === this.defaultBoot
+      form.get('type').hasError('required')
     );
   }
 
@@ -121,7 +119,6 @@ export class RegisterComponent implements OnInit {
       type: new UntypedFormControl('', Validators.required),
       uri: new UntypedFormControl('', [AppsAddValidator.appUri, Validators.required]),
       metaDataUri: new UntypedFormControl('', AppsAddValidator.appUri),
-      bootVersion: new UntypedFormControl(this.defaultBoot, Validators.required),
       force: new UntypedFormControl(false)
     });
 
diff --git a/ui/src/app/apps/apps.component.html b/ui/src/app/apps/apps.component.html
index 859b23249..bac8a2110 100644
--- a/ui/src/app/apps/apps.component.html
+++ b/ui/src/app/apps/apps.component.html
@@ -83,17 +83,6 @@ <h1 class="page-title-actions">
       <clr-dg-filter style="display: none"></clr-dg-filter>
     </ng-container>
   </clr-dg-column>
-  <clr-dg-column
-    [clrDgField]="'bootVersion'"
-    [clrDgSortOrder]="context.by === 'bootVersion' ? (context.reverse ? -1 : 1) : 0"
-    (clrDgColumnResize)="updateContext('sizeBootVersion', $event)"
-    [style.width.px]="context.sizeBootVersion | datagridcolumn: datagrid:contextName | async"
-  >
-    <ng-container>
-      {{ 'applications.main.bootVersion' | translate }}
-      <clr-dg-filter style="display: none"></clr-dg-filter>
-    </ng-container>
-  </clr-dg-column>
 
   <clr-dg-column
     [clrDgField]="'uri'"
@@ -128,9 +117,6 @@ <h1 class="page-title-actions">
         <span *ngIf="app.versions?.length > 1" class="badge badge-light-blue">{{ app.versions?.length }}</span>
       </span>
     </clr-dg-cell>
-    <clr-dg-cell>
-      {{ 'applications.main.bootVersions.' + app.bootVersion | translate }}
-    </clr-dg-cell>
     <clr-dg-cell
       ><span class="text-truncate">{{ app.uri }}</span></clr-dg-cell
     >
diff --git a/ui/src/app/apps/apps.component.spec.ts b/ui/src/app/apps/apps.component.spec.ts
index e593b2e61..3cd820b1b 100644
--- a/ui/src/app/apps/apps.component.spec.ts
+++ b/ui/src/app/apps/apps.component.spec.ts
@@ -80,7 +80,7 @@ describe('apps/apps.component.ts', () => {
     expect(actionBar).toBeTruthy();
     expect(title.textContent).toContain('Applications');
     expect(rows.length === 20).toBeTruthy();
-    expect(cols.length === 6).toBeTruthy();
+    expect(cols.length === 5).toBeTruthy();
     done();
   });
 
@@ -230,13 +230,13 @@ describe('apps/apps.component.ts', () => {
       sort: {by: 'version', reverse: true}
     });
     // URI
-    cols[4].query(By.css('button')).nativeElement.click();
+    cols[3].query(By.css('button')).nativeElement.click();
     fixture.detectChanges();
     expect(refresh).toHaveBeenCalledWith({
       page: {from: 0, to: 19, size: 20, current: 1},
       sort: {by: 'uri', reverse: false}
     });
-    cols[4].query(By.css('button')).nativeElement.click();
+    cols[3].query(By.css('button')).nativeElement.click();
     fixture.detectChanges();
     expect(refresh).toHaveBeenCalledWith({
       page: {from: 0, to: 19, size: 20, current: 1},
diff --git a/ui/src/app/shared/api/app.service.spec.ts b/ui/src/app/shared/api/app.service.spec.ts
index 8ae69e1d2..4c0b0c47d 100644
--- a/ui/src/app/shared/api/app.service.spec.ts
+++ b/ui/src/app/shared/api/app.service.spec.ts
@@ -110,7 +110,6 @@ describe('shared/api/app.service.ts', () => {
       uri: 'https://uri.foo.bar',
       metaDataUri: 'https://metaDataUri.foo.bar',
       type: ApplicationType.processor,
-      bootVersion: '3',
       force: true
     });
     const httpUri = mockHttp.post.calls.mostRecent().args[0];
@@ -121,7 +120,6 @@ describe('shared/api/app.service.ts', () => {
     expect(headerArgs.get('Accept')).toEqual('application/json');
     expect(httpParams.get('uri')).toEqual('https://uri.foo.bar');
     expect(httpParams.get('metadata-uri')).toEqual('https://metaDataUri.foo.bar');
-    expect(httpParams.get('bootVersion')).toEqual('3');
     expect(httpParams.get('force')).toEqual('true');
   });
 
diff --git a/ui/src/app/shared/api/app.service.ts b/ui/src/app/shared/api/app.service.ts
index 6ee214801..114849898 100644
--- a/ui/src/app/shared/api/app.service.ts
+++ b/ui/src/app/shared/api/app.service.ts
@@ -108,10 +108,7 @@ export class AppService {
   }
 
   registerProp(prop: any): Observable<any> {
-    let params = new HttpParams()
-      .append('uri', prop.uri)
-      .append('force', prop.force.toString())
-      .append('bootVersion', prop.bootVersion);
+    let params = new HttpParams().append('uri', prop.uri).append('force', prop.force.toString());
     if (prop.metaDataUri) {
       params = params.append('metadata-uri', prop.metaDataUri);
     }
diff --git a/ui/src/app/shared/api/job.service.ts b/ui/src/app/shared/api/job.service.ts
index 28482f35a..059428ed8 100644
--- a/ui/src/app/shared/api/job.service.ts
+++ b/ui/src/app/shared/api/job.service.ts
@@ -33,23 +33,21 @@ export class JobService {
       .pipe(map(JobExecutionPage.parse), catchError(ErrorUtils.catchError));
   }
 
-  getExecution(executionId: string, schemaTarget: string): Observable<JobExecution | unknown> {
+  getExecution(executionId: string): Observable<JobExecution | unknown> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).set('schemaTarget', schemaTarget);
     return this.httpClient
-      .get<any>(UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${executionId}`, {headers, params})
+      .get<any>(UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${executionId}`, {headers})
       .pipe(map(JobExecution.parse), catchError(ErrorUtils.catchError));
   }
 
   restart(execution: JobExecution): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
     const initHttpParams = new HttpParams({encoder: new DataflowEncoder()});
-    const params = initHttpParams.append('schemaTarget', execution.schemaTarget);
     return this.httpClient
       .put(
         UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${execution.jobExecutionId}?restart=true`,
         {},
-        {headers, params}
+        {headers}
       )
       .pipe(catchError(ErrorUtils.catchError));
   }
@@ -57,42 +55,25 @@ export class JobService {
   stop(item: JobExecution): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
     const initHttpParams = new HttpParams({encoder: new DataflowEncoder()});
-    const params = initHttpParams.append('schemaTarget', item.schemaTarget);
     return this.httpClient
-      .put(
-        UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${item.jobExecutionId}?stop=true`,
-        {},
-        {headers, params}
-      )
+      .put(UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${item.jobExecutionId}?stop=true`, {}, {headers})
       .pipe(catchError(ErrorUtils.catchError));
   }
 
-  getExecutionStep(
-    jobExecutionId: string,
-    stepId: string,
-    schemaTarget: string
-  ): Observable<ExecutionStepResource | unknown> {
+  getExecutionStep(jobExecutionId: string, stepId: string): Observable<ExecutionStepResource | unknown> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).append('schemaTarget', schemaTarget);
     return this.httpClient
       .get<any>(UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${jobExecutionId}/steps/${stepId}`, {
-        headers,
-        params
+        headers
       })
       .pipe(map(ExecutionStepResource.parse), catchError(ErrorUtils.catchError));
   }
 
-  getExecutionStepProgress(
-    jobExecutionId: string,
-    stepId: string,
-    schemaTarget: string
-  ): Observable<ExecutionStepProgress | unknown> {
+  getExecutionStepProgress(jobExecutionId: string, stepId: string): Observable<ExecutionStepProgress | unknown> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).append('schemaTarget', schemaTarget);
     return this.httpClient
       .get<any>(UrlUtilities.calculateBaseApiUrl() + `jobs/executions/${jobExecutionId}/steps/${stepId}/progress`, {
-        headers,
-        params
+        headers
       })
       .pipe(map(ExecutionStepProgress.parse), catchError(ErrorUtils.catchError));
   }
diff --git a/ui/src/app/shared/api/task.service.spec.ts b/ui/src/app/shared/api/task.service.spec.ts
index b6f0960ca..8c2a7e04d 100644
--- a/ui/src/app/shared/api/task.service.spec.ts
+++ b/ui/src/app/shared/api/task.service.spec.ts
@@ -104,12 +104,12 @@ describe('shared/api/task.service.ts', () => {
   it('executionsClean', async () => {
     mockHttp.delete.and.returnValue(of(jsonData));
     const taskExecutions = [
-      TaskExecution.parse({executionId: 'foo1', schemaTarget: 'boot2'}),
-      TaskExecution.parse({executionId: 'foo2', parentExecutionId: 'foo1', schemaTarget: 'boot2'}),
-      TaskExecution.parse({executionId: 'foo3', parentExecutionId: 'foo1', schemaTarget: 'boot3'}),
-      TaskExecution.parse({executionId: 'bar1', schemaTarget: 'boot3'}),
-      TaskExecution.parse({executionId: 'bar2', parentExecutionId: 'bar1', schemaTarget: 'boot2'}),
-      TaskExecution.parse({executionId: 'bar3', parentExecutionId: 'bar1', schemaTarget: 'boot3'})
+      TaskExecution.parse({executionId: 'foo1'}),
+      TaskExecution.parse({executionId: 'foo2', parentExecutionId: 'foo1'}),
+      TaskExecution.parse({executionId: 'foo3', parentExecutionId: 'foo1'}),
+      TaskExecution.parse({executionId: 'bar1'}),
+      TaskExecution.parse({executionId: 'bar2', parentExecutionId: 'bar1'}),
+      TaskExecution.parse({executionId: 'bar3', parentExecutionId: 'bar1'})
     ];
     await taskService.executionsClean(taskExecutions).toPromise();
     const httpUri = mockHttp.delete.calls.all();
@@ -117,10 +117,8 @@ describe('shared/api/task.service.ts', () => {
     expect(httpUri).not.toEqual(null);
     expect(httpUri.length).not.toEqual(0);
     expect(httpUri.map(url => url.args[0])).toEqual([
-      '/tasks/executions/foo2,bar2?action=CLEANUP,REMOVE_DATA&schemaTarget=boot2',
-      '/tasks/executions/foo3,bar3?action=CLEANUP,REMOVE_DATA&schemaTarget=boot3',
-      '/tasks/executions/foo1?action=CLEANUP,REMOVE_DATA&schemaTarget=boot2',
-      '/tasks/executions/bar1?action=CLEANUP,REMOVE_DATA&schemaTarget=boot3'
+      '/tasks/executions/foo2,foo3,bar2,bar3?action=CLEANUP,REMOVE_DATA',
+      '/tasks/executions/foo1,bar1?action=CLEANUP,REMOVE_DATA'
     ]);
   });
 
@@ -152,13 +150,12 @@ describe('shared/api/task.service.ts', () => {
     taskService.getExecutionLogs(
       TaskExecution.parse({
         externalExecutionId: 'foo',
-        schemaTarget: 'boot3',
         arguments: ['--spring.cloud.data.flow.platformname=bar']
       })
     );
     const httpUri = mockHttp.get.calls.mostRecent().args[0];
     const headerArgs = mockHttp.get.calls.mostRecent().args[1].headers;
-    expect(httpUri).toEqual('/tasks/logs/foo?platformName=bar&schemaTarget=boot3');
+    expect(httpUri).toEqual('/tasks/logs/foo?platformName=bar');
     expect(headerArgs.get('Content-Type')).toEqual('application/json');
     expect(headerArgs.get('Accept')).toEqual('application/json');
   });
diff --git a/ui/src/app/shared/api/task.service.ts b/ui/src/app/shared/api/task.service.ts
index 6239522e4..bc906e441 100644
--- a/ui/src/app/shared/api/task.service.ts
+++ b/ui/src/app/shared/api/task.service.ts
@@ -94,24 +94,17 @@ export class TaskService {
 
   executionStop(taskExecution: TaskExecution): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).append('schemaTarget', taskExecution?.schemaTarget);
     return this.httpClient
-      .post<any>(
-        UrlUtilities.calculateBaseApiUrl() + `tasks/executions/${taskExecution.executionId}`,
-        {},
-        {headers, params}
-      )
+      .post<any>(UrlUtilities.calculateBaseApiUrl() + `tasks/executions/${taskExecution.executionId}`, {}, {headers})
       .pipe(catchError(ErrorUtils.catchError));
   }
 
   executionClean(taskExecution: TaskExecution): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).append('schemaTarget', taskExecution.schemaTarget);
     const url = UrlUtilities.calculateBaseApiUrl() + `tasks/executions/${taskExecution.executionId}?action=REMOVE_DATA`;
     return this.httpClient
       .delete<any>(url, {
         headers,
-        params,
         observe: 'response'
       })
       .pipe(catchError(ErrorUtils.catchError));
@@ -134,39 +127,24 @@ export class TaskService {
     const taskExecutionsChildren = taskExecutions.filter(taskExecution => taskExecution.parentExecutionId);
     const taskExecutionsParents = taskExecutions.filter(taskExecution => !taskExecution.parentExecutionId);
     if (taskExecutionsChildren.length > 0) {
-      await this.executionsCleanBySchema(taskExecutionsChildren);
+      await this.executionsCleanGrouped(taskExecutionsChildren);
     }
     if (taskExecutionsParents.length > 0) {
-      await this.executionsCleanBySchema(taskExecutionsParents);
+      await this.executionsCleanGrouped(taskExecutionsParents);
     }
     return Promise.resolve();
   }
 
-  private async executionsCleanBySchema(taskExecutions: TaskExecution[]): Promise<void> {
-    const groupBySchemaTarget = taskExecutions.reduce((group, task) => {
-      const schemaTarget = task.schemaTarget;
-      group[schemaTarget] = group[schemaTarget] ?? [];
-      group[schemaTarget].push(task);
-      return group;
-    }, {});
-    for (const schemaTarget in groupBySchemaTarget) {
-      if (schemaTarget) {
-        const group: TaskExecution[] = groupBySchemaTarget[schemaTarget];
-        const ids = group.map(task => task.executionId);
-        if (ids.length > 0) {
-          await this.taskExecutionsCleanByIds(ids, schemaTarget).toPromise();
-        }
-      }
-    }
+  private async executionsCleanGrouped(taskExecutions: TaskExecution[]): Promise<void> {
+    const ids = taskExecutions.map(task => task.executionId);
+    await this.taskExecutionsCleanByIds(ids);
     return Promise.resolve();
   }
 
-  taskExecutionsCleanByIds(ids: number[], schemaTarget: string): Observable<any> {
+  taskExecutionsCleanByIds(ids: number[]): Observable<any> {
     const headers = HttpUtils.getDefaultHttpHeaders();
     const idStr = ids.join(',');
-    const url =
-      UrlUtilities.calculateBaseApiUrl() +
-      `tasks/executions/${idStr}?action=CLEANUP,REMOVE_DATA&schemaTarget=${schemaTarget}`;
+    const url = UrlUtilities.calculateBaseApiUrl() + `tasks/executions/${idStr}?action=CLEANUP,REMOVE_DATA`;
     return this.httpClient.delete<any>(url, {headers, observe: 'response'}).pipe(catchError(ErrorUtils.catchError));
   }
 
@@ -232,19 +210,17 @@ export class TaskService {
       .pipe(map(TaskExecution.parse), catchError(ErrorUtils.catchError));
   }
 
-  getExecutionById(executionId: number, schemaTarget: string): Observable<TaskExecution | unknown> {
+  getExecutionById(executionId: number): Observable<TaskExecution | unknown> {
     const headers = HttpUtils.getDefaultHttpHeaders();
-    const params = new HttpParams({encoder: new DataflowEncoder()}).set('schemaTarget', schemaTarget);
     return this.httpClient
       .get<any>(UrlUtilities.calculateBaseApiUrl() + `tasks/executions/${executionId ?? 0}`, {
-        headers: headers,
-        params: params
+        headers: headers
       })
       .pipe(map(TaskExecution.parse), catchError(ErrorUtils.catchError));
   }
 
   getExecution(taskExecution: TaskExecution): Observable<TaskExecution | unknown> {
-    return this.getExecutionById(taskExecution.executionId, taskExecution.schemaTarget);
+    return this.getExecutionById(taskExecution.executionId);
   }
 
   getExecutionLogs(taskExecution: TaskExecution): Observable<any> {
@@ -262,7 +238,7 @@ export class TaskService {
       taskExecution?._links && taskExecution?._links['tasks/logs'] !== undefined
         ? taskExecution?._links['tasks/logs'].href
         : UrlUtilities.calculateBaseApiUrl() +
-          `tasks/logs/${taskExecution.externalExecutionId}?platformName=${platformName}&schemaTarget=${taskExecution.schemaTarget}`;
+          `tasks/logs/${taskExecution.externalExecutionId}?platformName=${platformName}`;
     const params = new HttpParams({encoder: new DataflowEncoder()});
     return this.httpClient
       .get<any>(
diff --git a/ui/src/app/shared/model/job.model.ts b/ui/src/app/shared/model/job.model.ts
index 19b8c496d..d969bb0b3 100644
--- a/ui/src/app/shared/model/job.model.ts
+++ b/ui/src/app/shared/model/job.model.ts
@@ -185,7 +185,6 @@ export class JobExecution {
   public jobParametersString: string;
   public exitCode: string;
   public exitMessage: string;
-  public schemaTarget: string;
   public stepExecutions: ExecutionStep[];
   public restartable: boolean;
   public abandonable: boolean;
@@ -212,7 +211,6 @@ export class JobExecution {
     jobExecution.abandonable = input.abandonable;
     jobExecution.stoppable = input.stoppable;
     jobExecution.defined = input.defined;
-    jobExecution.schemaTarget = input.schemaTarget;
     jobExecution.jobParametersString = input.jobParametersString;
     if (get(input, 'jobExecution.stepExecutions')) {
       jobExecution.stepExecutions = input.jobExecution.stepExecutions.map(ExecutionStep.parse);
@@ -243,7 +241,6 @@ export class JobExecution {
     jobExecution.abandonable = input.abandonable;
     jobExecution.stoppable = input.stoppable;
     jobExecution.defined = input.defined;
-    jobExecution.schemaTarget = input.schemaTarget;
     jobExecution.jobParametersString = input.jobParametersString;
     return jobExecution;
   }
diff --git a/ui/src/app/shared/model/task-execution.model.ts b/ui/src/app/shared/model/task-execution.model.ts
index d30232773..912bc0242 100644
--- a/ui/src/app/shared/model/task-execution.model.ts
+++ b/ui/src/app/shared/model/task-execution.model.ts
@@ -11,11 +11,9 @@ interface TaskExecutionLinks {
 
 export class LaunchResponse {
   executionId: number;
-  schemaTarget: string;
   static parse(input: any): LaunchResponse {
     const response = new LaunchResponse();
     response.executionId = input?.executionId;
-    response.schemaTarget = input?.schemaTarget;
     return response;
   }
 }
@@ -31,7 +29,6 @@ export class TaskExecution {
   arguments: string[];
   jobExecutionIds: number[];
   errorMessage: string;
-  schemaTarget: string;
   externalExecutionId: string;
   taskExecutionStatus: string;
   parentExecutionId: number;
@@ -50,7 +47,6 @@ export class TaskExecution {
     execution.endTime = input?.endTime ? DateTime.fromISO(input.endTime) : null;
     execution.exitMessage = input?.exitMessage;
     execution.arguments = input?.arguments || [];
-    execution.schemaTarget = input?.schemaTarget || 'boot2';
     execution.jobExecutionIds = input?.jobExecutionIds || [];
     execution.errorMessage = input?.errorMessage;
     execution.taskExecutionStatus = input?.taskExecutionStatus;
@@ -60,7 +56,6 @@ export class TaskExecution {
     execution.appProperties = input?.appProperties;
     execution.deploymentProperties = input?.deploymentProperties;
     execution._links = input?._links;
-    execution.schemaTarget = input?.schemaTarget;
     return execution;
   }
 
diff --git a/ui/src/app/tasks-jobs/executions/execution/execution.component.html b/ui/src/app/tasks-jobs/executions/execution/execution.component.html
index cafc65538..c8d60ac75 100644
--- a/ui/src/app/tasks-jobs/executions/execution/execution.component.html
+++ b/ui/src/app/tasks-jobs/executions/execution/execution.component.html
@@ -54,10 +54,6 @@ <h1>
                 <div class="key">{{ 'executions.main.executionId' | translate }}</div>
                 <div class="value">{{ execution.executionId }}</div>
               </div>
-              <div class="row">
-                <div class="key">{{ 'executions.main.schemaTarget' | translate }}</div>
-                <div class="value">{{ execution.schemaTarget }}</div>
-              </div>
               <div class="row">
                 <div class="key">{{ 'executions.main.arguments' | translate }}</div>
                 <div class="value">
@@ -87,9 +83,7 @@ <h1>
                 <div class="key">{{ 'executions.main.jobExecutionIds' | translate }}</div>
                 <div class="value">
                   <a
-                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}/schemaTarget/{{
-                      execution.schemaTarget
-                    }}"
+                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}"
                     *ngFor="let jobExecutionId of execution.jobExecutionIds"
                   >
                     {{ jobExecutionId }}
diff --git a/ui/src/app/tasks-jobs/executions/execution/execution.component.ts b/ui/src/app/tasks-jobs/executions/execution/execution.component.ts
index b56e1e343..e53d55af5 100644
--- a/ui/src/app/tasks-jobs/executions/execution/execution.component.ts
+++ b/ui/src/app/tasks-jobs/executions/execution/execution.component.ts
@@ -44,7 +44,6 @@ export class ExecutionComponent implements OnInit {
         mergeMap(params => {
           this.execution = new TaskExecution();
           this.execution.executionId = params.executionId;
-          this.execution.schemaTarget = params.schemaTarget;
           return this.taskService.getExecution(this.execution);
         })
       )
diff --git a/ui/src/app/tasks-jobs/executions/executions.component.html b/ui/src/app/tasks-jobs/executions/executions.component.html
index 00ae18227..94784bea4 100644
--- a/ui/src/app/tasks-jobs/executions/executions.component.html
+++ b/ui/src/app/tasks-jobs/executions/executions.component.html
@@ -54,13 +54,6 @@ <h1>{{ 'executions.main.title' | translate }}</h1>
     <ng-container>{{ 'executions.main.taskName' | translate }}</ng-container>
     <clr-dg-filter style="display: none"></clr-dg-filter>
   </clr-dg-column>
-  <clr-dg-column
-    (clrDgColumnResize)="updateContext('sizeSchemaTarget', $event)"
-    [style.width.px]="context.sizeSchemaTarget | datagridcolumn: datagrid:contextName | async"
-  >
-    <ng-container>{{ 'executions.main.schemaTarget' | translate }}</ng-container>
-    <clr-dg-filter style="display: none"></clr-dg-filter>
-  </clr-dg-column>
   <clr-dg-column
     (clrDgColumnResize)="updateContext('sizeDuration', $event)"
     [style.width.px]="context.sizeDuration | datagridcolumn: datagrid:contextName | async"
@@ -104,15 +97,11 @@ <h1>{{ 'executions.main.title' | translate }}</h1>
   </clr-dg-column>
   <clr-dg-row *ngFor="let execution of page?.items" [clrDgItem]="execution">
     <clr-dg-cell>
-      <a
-        routerLink="/tasks-jobs/task-executions/{{ execution.executionId }}/schemaTarget/{{ execution.schemaTarget }}"
-        >{{ execution.executionId }}</a
-      >
+      <a routerLink="/tasks-jobs/task-executions/{{ execution.executionId }}/">{{ execution.executionId }}</a>
     </clr-dg-cell>
     <clr-dg-cell>
       <a routerLink="/tasks-jobs/tasks/{{ execution.taskName }}">{{ execution.taskName }}</a>
     </clr-dg-cell>
-    <clr-dg-cell>{{ execution.schemaTarget }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.startTime | duration: execution.endTime }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.startTime | datetime }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.endTime | datetime }}</clr-dg-cell>
diff --git a/ui/src/app/tasks-jobs/executions/executions.component.ts b/ui/src/app/tasks-jobs/executions/executions.component.ts
index 709654596..d87e3ad3e 100644
--- a/ui/src/app/tasks-jobs/executions/executions.component.ts
+++ b/ui/src/app/tasks-jobs/executions/executions.component.ts
@@ -61,9 +61,7 @@ export class ExecutionsComponent extends DatagridComponent {
   }
 
   details(execution: TaskExecution): void {
-    this.router.navigateByUrl(
-      `tasks-jobs/task-executions/${execution.executionId}/schemaTarget/${execution.schemaTarget}`
-    );
+    this.router.navigateByUrl(`tasks-jobs/task-executions/${execution.executionId}`);
   }
 
   taskDetails(execution: TaskExecution): void {
diff --git a/ui/src/app/tasks-jobs/jobs/execution/execution.component.html b/ui/src/app/tasks-jobs/jobs/execution/execution.component.html
index 67bf277ba..cf1204a29 100644
--- a/ui/src/app/tasks-jobs/jobs/execution/execution.component.html
+++ b/ui/src/app/tasks-jobs/jobs/execution/execution.component.html
@@ -50,18 +50,11 @@ <h1>
             <div class="row">
               <div class="key">{{ 'jobs.main.taskExecutionId' | translate }}</div>
               <div class="value">
-                <a
-                  routerLink="/tasks-jobs/task-executions/{{ execution.taskExecutionId }}/schemaTarget/{{
-                    execution.schemaTarget
-                  }}"
-                  >{{ execution.taskExecutionId }}</a
-                >
+                <a routerLink="/tasks-jobs/task-executions/{{ execution.taskExecutionId }}">{{
+                  execution.taskExecutionId
+                }}</a>
               </div>
             </div>
-            <div class="row">
-              <div class="key">{{ 'jobs.main.schemaTarget' | translate }}</div>
-              <div class="value">{{ execution.schemaTarget }}</div>
-            </div>
             <div class="row">
               <div class="key">{{ 'jobs.main.jobParameters' | translate }}</div>
               <div class="value">{{ execution.jobParametersString }}</div>
@@ -182,10 +175,6 @@ <h1>
                 <div class="key">{{ 'executions.main.executionId' | translate }}</div>
                 <div class="value">{{ taskExecution.executionId }}</div>
               </div>
-              <div class="row">
-                <div class="key">{{ 'executions.main.schemaTarget' | translate }}</div>
-                <div class="value">{{ taskExecution.schemaTarget }}</div>
-              </div>
               <div class="row">
                 <div class="key">{{ 'executions.main.arguments' | translate }}</div>
                 <div class="value">
@@ -208,9 +197,7 @@ <h1>
                 <div class="key">{{ 'executions.main.jobExecutionIds' | translate }}</div>
                 <div class="value">
                   <a
-                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}/schemaTarget/{{
-                      taskExecution.schemaTarget
-                    }}"
+                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}"
                     *ngFor="let jobExecutionId of taskExecution.jobExecutionIds"
                   >
                     {{ jobExecutionId }}
@@ -329,20 +316,14 @@ <h1>
             <tbody>
               <tr *ngFor="let step of execution.stepExecutions">
                 <td class="left">
-                  <a
-                    routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/{{ step.id }}/schemaTarget/{{
-                      execution.schemaTarget
-                    }}"
-                    >{{ step.id }}</a
-                  >
+                  <a routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/{{ step.id }}">{{
+                    step.id
+                  }}</a>
                 </td>
                 <td class="left">
-                  <a
-                    routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/{{ step.id }}/schemaTarget/{{
-                      execution.schemaTarget
-                    }}"
-                    >{{ step.name }}</a
-                  >
+                  <a routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/{{ step.id }}">{{
+                    step.name
+                  }}</a>
                 </td>
                 <td class="left">{{ step.readCount }}</td>
                 <td class="left">{{ step.writeCount }}</td>
diff --git a/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts b/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts
index 77ce5098c..224111151 100644
--- a/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts
+++ b/ui/src/app/tasks-jobs/jobs/execution/execution.component.ts
@@ -49,8 +49,7 @@ export class ExecutionComponent implements OnInit {
         mergeMap(val => {
           this.execution = new JobExecution();
           this.execution.jobExecutionId = val.executionId;
-          this.execution.schemaTarget = val.schemaTarget;
-          return this.jobService.getExecution(val.executionId, val.schemaTarget);
+          return this.jobService.getExecution(val.executionId);
         })
       )
       .subscribe(
@@ -70,7 +69,7 @@ export class ExecutionComponent implements OnInit {
 
   getTaskExecution(): void {
     this.loadingExecution = true;
-    this.taskService.getExecutionById(this.execution.taskExecutionId, this.execution.schemaTarget).subscribe(
+    this.taskService.getExecutionById(this.execution.taskExecutionId).subscribe(
       (taskExecution: TaskExecution) => {
         this.taskExecution = taskExecution;
         this.getTask();
@@ -161,9 +160,7 @@ export class ExecutionComponent implements OnInit {
   }
 
   navigateTaskExecution(): void {
-    this.router.navigateByUrl(
-      `/tasks-jobs/task-executions/${this.taskExecution.executionId}/schemaTarget/${this.taskExecution.schemaTarget}`
-    );
+    this.router.navigateByUrl(`/tasks-jobs/task-executions/${this.taskExecution.executionId}`);
   }
 
   relaunch(): void {
diff --git a/ui/src/app/tasks-jobs/jobs/jobs.component.html b/ui/src/app/tasks-jobs/jobs/jobs.component.html
index d8e8874f7..39c346fb7 100644
--- a/ui/src/app/tasks-jobs/jobs/jobs.component.html
+++ b/ui/src/app/tasks-jobs/jobs/jobs.component.html
@@ -32,13 +32,6 @@ <h1>{{ 'jobs.main.title' | translate }}</h1>
     <ng-container>{{ 'jobs.main.instanceId' | translate }}</ng-container>
     <clr-dg-filter style="display: none"></clr-dg-filter>
   </clr-dg-column>
-  <clr-dg-column
-    (clrDgColumnResize)="updateContext('sizeSchemaTarget', $event)"
-    [style.width.px]="context.sizeSchemaTarget | datagridcolumn: datagrid:contextName | async"
-  >
-    <ng-container>{{ 'jobs.main.schemaTarget' | translate }}</ng-container>
-    <clr-dg-filter style="display: none"></clr-dg-filter>
-  </clr-dg-column>
   <clr-dg-column
     (clrDgColumnResize)="updateContext('sizeStart', $event)"
     [style.width.px]="context.sizeStart | datagridcolumn: datagrid:contextName | async"
@@ -65,20 +58,13 @@ <h1>{{ 'jobs.main.title' | translate }}</h1>
   </clr-dg-column>
   <clr-dg-row *ngFor="let execution of page?.items" [clrDgItem]="execution">
     <clr-dg-cell>
-      <a
-        routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/schemaTarget/{{ execution.schemaTarget }}"
-        >{{ execution.jobExecutionId }}</a
-      >
+      <a routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}">{{ execution.jobExecutionId }}</a>
     </clr-dg-cell>
     <clr-dg-cell>
-      <a
-        routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}/schemaTarget/{{ execution.schemaTarget }}"
-        >{{ execution.name }}</a
-      >
+      <a routerLink="/tasks-jobs/job-executions/{{ execution.jobExecutionId }}">{{ execution.name }}</a>
     </clr-dg-cell>
     <clr-dg-cell>{{ execution.taskExecutionId }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.jobInstanceId }}</clr-dg-cell>
-    <clr-dg-cell>{{ execution.schemaTarget }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.startTime | datetime }}</clr-dg-cell>
     <clr-dg-cell>{{ execution.stepExecutionCount }}</clr-dg-cell>
     <clr-dg-cell
diff --git a/ui/src/app/tasks-jobs/jobs/jobs.component.ts b/ui/src/app/tasks-jobs/jobs/jobs.component.ts
index 89a6d1edb..a7318a56f 100644
--- a/ui/src/app/tasks-jobs/jobs/jobs.component.ts
+++ b/ui/src/app/tasks-jobs/jobs/jobs.component.ts
@@ -53,9 +53,7 @@ export class JobsComponent extends DatagridComponent {
   }
 
   details(execution: JobExecution): void {
-    this.router.navigateByUrl(
-      `tasks-jobs/job-executions/${execution.jobExecutionId}/schemaTarget/${execution.schemaTarget}`
-    );
+    this.router.navigateByUrl(`tasks-jobs/job-executions/${execution.jobExecutionId}`);
   }
 
   restart(execution: JobExecution): void {
diff --git a/ui/src/app/tasks-jobs/jobs/step/step.component.html b/ui/src/app/tasks-jobs/jobs/step/step.component.html
index af912cf88..a130ae247 100644
--- a/ui/src/app/tasks-jobs/jobs/step/step.component.html
+++ b/ui/src/app/tasks-jobs/jobs/step/step.component.html
@@ -293,10 +293,6 @@ <h1>
                 <div class="key">{{ 'executions.main.executionId' | translate }}</div>
                 <div class="value">{{ taskExecution.executionId }}</div>
               </div>
-              <div class="row">
-                <div class="key">{{ 'jobs.main.schemaTarget' | translate }}</div>
-                <div class="value">{{ taskExecution?.schemaTarget }}</div>
-              </div>
               <div class="row">
                 <div class="key">{{ 'executions.main.arguments' | translate }}</div>
                 <div class="value">
@@ -313,9 +309,7 @@ <h1>
                 <div class="key">{{ 'executions.main.jobExecutionIds' | translate }}</div>
                 <div class="value">
                   <a
-                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}/schemaTarget/{{
-                      taskExecution.schemaTarget
-                    }}"
+                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}"
                     *ngFor="let jobExecutionId of taskExecution.jobExecutionIds"
                   >
                     {{ jobExecutionId }}
diff --git a/ui/src/app/tasks-jobs/jobs/step/step.component.ts b/ui/src/app/tasks-jobs/jobs/step/step.component.ts
index 8518af1b0..8400ff94d 100644
--- a/ui/src/app/tasks-jobs/jobs/step/step.component.ts
+++ b/ui/src/app/tasks-jobs/jobs/step/step.component.ts
@@ -52,9 +52,9 @@ export class StepComponent implements OnInit {
       .pipe(
         mergeMap(params =>
           forkJoin([
-            this.jobService.getExecution(params.executionId, params.schemaTarget),
-            this.jobService.getExecutionStep(params.executionId, params.stepId, params.schemaTarget),
-            this.jobService.getExecutionStepProgress(params.executionId, params.stepId, params.schemaTarget)
+            this.jobService.getExecution(params.executionId),
+            this.jobService.getExecutionStep(params.executionId, params.stepId),
+            this.jobService.getExecutionStepProgress(params.executionId, params.stepId)
           ]).pipe(
             map(results => ({
               execution: results[0],
@@ -83,7 +83,7 @@ export class StepComponent implements OnInit {
 
   getTaskExecution(): void {
     this.loadingExecution = true;
-    this.taskService.getExecutionById(this.execution.taskExecutionId, this.execution.schemaTarget).subscribe(
+    this.taskService.getExecutionById(this.execution.taskExecutionId).subscribe(
       (taskExecution: TaskExecution) => {
         this.taskExecution = taskExecution;
         this.getTask();
@@ -151,9 +151,7 @@ export class StepComponent implements OnInit {
   }
 
   navigateTaskExecution(): void {
-    this.router.navigateByUrl(
-      `/tasks-jobs/task-executions/${this.taskExecution.executionId}/schemaTarget/${this.taskExecution.schemaTarget}`
-    );
+    this.router.navigateByUrl(`/tasks-jobs/task-executions/${this.taskExecution.executionId}`);
   }
 
   relaunch(): void {
diff --git a/ui/src/app/tasks-jobs/tasks-jobs-routing.module.ts b/ui/src/app/tasks-jobs/tasks-jobs-routing.module.ts
index 697868741..ccbd7dde9 100644
--- a/ui/src/app/tasks-jobs/tasks-jobs-routing.module.ts
+++ b/ui/src/app/tasks-jobs/tasks-jobs-routing.module.ts
@@ -45,7 +45,7 @@ const routes: Routes = [
         component: ExecutionsComponent
       },
       {
-        path: 'task-executions/:executionId/schemaTarget/:schemaTarget',
+        path: 'task-executions/:executionId',
         component: ExecutionComponent
       },
       {
@@ -53,11 +53,11 @@ const routes: Routes = [
         component: JobsComponent
       },
       {
-        path: 'job-executions/:executionId/schemaTarget/:schemaTarget',
+        path: 'job-executions/:executionId',
         component: JobExecutionComponent
       },
       {
-        path: 'job-executions/:executionId/:stepId/schemaTarget/:schemaTarget',
+        path: 'job-executions/:executionId/:stepId',
         component: StepComponent
       },
       {
diff --git a/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts b/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts
index 6a3c481e8..1ad747c03 100644
--- a/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts
+++ b/ui/src/app/tasks-jobs/tasks/launch/launch.component.spec.ts
@@ -123,7 +123,7 @@ describe('streams/streams/deploy/deploy.component.ts', () => {
     fixture.detectChanges();
     await fixture.whenStable();
     expect(spy).toHaveBeenCalled();
-    expect(navigate).toHaveBeenCalledWith(['tasks-jobs/task-executions/0/schemaTarget/boot2']);
+    expect(navigate).toHaveBeenCalledWith(['tasks-jobs/task-executions/0']);
     done();
   });
 });
diff --git a/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts b/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts
index 32ca517c8..60c4ce171 100644
--- a/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts
+++ b/ui/src/app/tasks-jobs/tasks/launch/launch.component.ts
@@ -202,11 +202,7 @@ export class LaunchComponent implements OnInit, OnDestroy {
           this.translate.instant('tasks.launch.main.message.successTitle'),
           this.translate.instant('tasks.launch.main.message.successContent', {name: this.task.name})
         );
-        this.router.navigate([
-          `tasks-jobs/task-executions/${launchResponse.executionId ?? 0}/schemaTarget/${
-            launchResponse.schemaTarget ?? 'boot2'
-          }`
-        ]);
+        this.router.navigate([`tasks-jobs/task-executions/${launchResponse.executionId ?? 0}`]);
       },
       error => {
         this.isLaunching = false;
diff --git a/ui/src/app/tasks-jobs/tasks/task/task.component.html b/ui/src/app/tasks-jobs/tasks/task/task.component.html
index 4e6915800..895857328 100644
--- a/ui/src/app/tasks-jobs/tasks/task/task.component.html
+++ b/ui/src/app/tasks-jobs/tasks/task/task.component.html
@@ -101,12 +101,6 @@ <h1 class="page-title">
                 <div class="key">{{ 'executions.main.executionId' | translate }}</div>
                 <div class="value">{{ task.lastTaskExecution?.executionId }}</div>
               </div>
-              <div class="row">
-                <div class="key">{{ 'executions.main.schemaTarget' | translate }}</div>
-                <div class="value">
-                  {{ task.lastTaskExecution.schemaTarget }}
-                </div>
-              </div>
               <div class="row">
                 <div class="key">{{ 'executions.main.arguments' | translate }}</div>
                 <div class="value">
@@ -136,9 +130,7 @@ <h1 class="page-title">
                 <div class="key">{{ 'executions.main.jobExecutionIds' | translate }}</div>
                 <div class="value">
                   <a
-                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}/schemaTarget/{{
-                      taskExecution.schemaTarget
-                    }}"
+                    routerLink="/tasks-jobs/job-executions/{{ jobExecutionId }}"
                     *ngFor="let jobExecutionId of taskExecution?.jobExecutionIds"
                   >
                     {{ jobExecutionId }}
@@ -247,12 +239,9 @@ <h1 class="page-title">
               <tbody>
                 <tr *ngFor="let execution of executions?.items">
                   <td class="left">
-                    <a
-                      routerLink="/tasks-jobs/task-executions/{{ execution.executionId }}/schemaTarget/{{
-                        execution.schemaTarget
-                      }}"
-                      >{{ execution.executionId }}</a
-                    >
+                    <a routerLink="/tasks-jobs/task-executions/{{ execution.executionId }}">{{
+                      execution.executionId
+                    }}</a>
                   </td>
                   <td class="left">{{ execution.startTime | datetime }}</td>
                   <td class="left">{{ execution.endTime | datetime }}</td>
diff --git a/ui/src/app/tasks-jobs/tasks/task/task.component.ts b/ui/src/app/tasks-jobs/tasks/task/task.component.ts
index e06ffcbe6..b555961dc 100644
--- a/ui/src/app/tasks-jobs/tasks/task/task.component.ts
+++ b/ui/src/app/tasks-jobs/tasks/task/task.component.ts
@@ -179,9 +179,7 @@ export class TaskComponent implements OnInit {
   }
 
   navigateExecution(execution: TaskExecution): void {
-    this.router.navigateByUrl(
-      `tasks-jobs/task-executions/${execution.executionId}/schemaTarget/${execution.schemaTarget}`
-    );
+    this.router.navigateByUrl(`tasks-jobs/task-executions/${execution.executionId}`);
   }
 
   destroy(): void {
diff --git a/ui/src/app/tests/api/task.service.mock.ts b/ui/src/app/tests/api/task.service.mock.ts
index b7ffd22c2..415e7fa11 100644
--- a/ui/src/app/tests/api/task.service.mock.ts
+++ b/ui/src/app/tests/api/task.service.mock.ts
@@ -78,7 +78,7 @@ export class TaskServiceMock {
     return of(GET_EXECUTION).pipe(delay(1), map(TaskExecution.parse));
   }
 
-  getExecutionById(executionId: number, schemaTarget: string): Observable<TaskExecution | unknown> {
+  getExecutionById(executionId: number): Observable<TaskExecution | unknown> {
     return of(GET_EXECUTION).pipe(delay(1), map(TaskExecution.parse));
   }