diff --git a/.editorconfig b/.editorconfig
index 17134ab1..ee325e21 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,9 @@ trim_trailing_whitespace = false
 indent_size = 2
 indent_style = space
 
+[composer.json]
+indent_size = 4
+
 # Don't perform any clean-up on thirdparty files
 [thirdparty/**]
 trim_trailing_whitespace = false
diff --git a/composer.json b/composer.json
index fb45e10e..a2c273cd 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "phpunit/phpunit": "^5.7",
         "silverstripe/behat-extension": "^3@dev",
-        "silverstripe/serve": "dev-master",
+        "silverstripe/serve": "^2",
         "se/selenium-server-standalone": "2.41.0"
     },
     "extra": {
@@ -53,4 +53,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}