diff --git a/src/controllers/RunnerController.ts b/src/controllers/RunnerController.ts
index 851a495..6885d3c 100644
--- a/src/controllers/RunnerController.ts
+++ b/src/controllers/RunnerController.ts
@@ -32,16 +32,16 @@ export class RunnerController {
 	}
 
 	@Get('/:id')
-	@ResponseSchema(Runner)
+	@ResponseSchema(ResponseRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OnUndefined(RunnerNotFoundError)
 	@OpenAPI({ description: 'Returns a runner of a specified id (if it exists)' })
-	getOne(@Param('id') id: number) {
-		return this.runnerRepository.findOne({ id: id });
+	async getOne(@Param('id') id: number) {
+		return new ResponseRunner(await this.runnerRepository.findOne({ id: id }));
 	}
 
 	@Post()
-	@ResponseSchema(Runner)
+	@ResponseSchema(ResponseRunner)
 	@ResponseSchema(RunnerOnlyOneGroupAllowedError)
 	@ResponseSchema(RunnerGroupNeededError)
 	@ResponseSchema(RunnerGroupNotFoundError)
@@ -54,11 +54,11 @@ export class RunnerController {
 			return error;
 		}
 
-		return this.runnerRepository.save(runner);
+		return new ResponseRunner(await this.runnerRepository.save(runner));
 	}
 
 	@Put('/:id')
-	@ResponseSchema(Runner)
+	@ResponseSchema(ResponseRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@ResponseSchema(RunnerIdsNotMatchingError, { statusCode: 406 })
 	@OpenAPI({ description: "Update a runner object (id can't be changed)." })
@@ -74,11 +74,11 @@ export class RunnerController {
 		}
 
 		await this.runnerRepository.update(oldRunner, runner);
-		return runner;
+		return new ResponseRunner(runner);
 	}
 
 	@Delete('/:id')
-	@ResponseSchema(Runner)
+	@ResponseSchema(ResponseRunner)
 	@ResponseSchema(RunnerNotFoundError, { statusCode: 404 })
 	@OpenAPI({ description: 'Delete a specified runner (if it exists).' })
 	async remove(@Param('id') id: number, @QueryParam("force") force: boolean) {
@@ -89,6 +89,6 @@ export class RunnerController {
 		}
 
 		await this.runnerRepository.delete(runner);
-		return runner;
+		return new ResponseRunner(runner);
 	}
 }