diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java
index 4f7e9d0d..d8364a40 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/CommandLineMetadataController.java
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  *
  * @author Stephane Nicoll
  */
-@Controller
+@RestController
 public class CommandLineMetadataController extends AbstractMetadataController {
 
 	private final CommandLineHelpGenerator commandLineHelpGenerator;
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java
index 720da5a4..78711ed7 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectGenerationController.java
@@ -65,7 +65,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @param <R> the {@link ProjectRequest} type to use to bind request parameters
  * @author Stephane Nicoll
  */
-@Controller
+@RestController
 public abstract class ProjectGenerationController<R extends ProjectRequest> {
 
 	private static final Log logger = LogFactory.getLog(ProjectGenerationController.class);
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java
index 110b29d2..3cc0557f 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/ProjectMetadataController.java
@@ -50,7 +50,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  *
  * @author Stephane Nicoll
  */
-@Controller
+@RestController
 public class ProjectMetadataController extends AbstractMetadataController {
 
 	/**
@@ -67,7 +67,6 @@ public class ProjectMetadataController extends AbstractMetadataController {
 	}
 
 	@RequestMapping(path = "/metadata/config", produces = "application/json")
-	@ResponseBody
 	public InitializrMetadata config() {
 		return this.metadataProvider.get();
 	}
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java b/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java
index 01014d52..c302afc8 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/controller/SpringCliDistributionController.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  *
  * @author Stephane Nicoll
  */
-@Controller
+@RestController
 public class SpringCliDistributionController {
 
 	private final InitializrMetadataProvider metadataProvider;