diff --git a/bin/serve b/bin/serve
index a25bad5..a2fbead 100755
--- a/bin/serve
+++ b/bin/serve
@@ -2,6 +2,8 @@
 <?php
 
 // Serve always hosts from the root
+use SilverStripe\Core\Environment;
+
 define('BASE_URL', '');
 
 // Autoload
@@ -22,24 +24,24 @@ $options = getopt(null, [ 'host:', 'port:', 'hash:', 'bootstrap-file:' ]);
 
 if (!empty($options['host'])) {
 	$host = $options['host'];
-} elseif (getenv('SERVE_HOST')) {
-	$host = getenv('SERVE_HOST');
+} elseif (Environment::getEnv('SERVE_HOST')) {
+	$host = Environment::getEnv('SERVE_HOST');
 } else {
 	$host = '0.0.0.0';
 }
 
 if (!empty($options['port'])) {
 	$port = $options['port'];
-} elseif (getenv('SERVE_PORT')) {
-	$port = getenv('SERVE_PORT');
+} elseif (Environment::getEnv('SERVE_PORT')) {
+	$port = Environment::getEnv('SERVE_PORT');
 } else {
 	$port = '8080';
 }
 
 if (!empty($options['bootstrap-file'])) {
 	$bootstrapFile = $options['bootstrap-file'];
-} elseif (getenv('SERVE_BOOTSTRAP_FILE')) {
-	$bootstrapFile = getenv('SERVE_BOOTSTRAP_FILE');
+} elseif (Environment::getEnv('SERVE_BOOTSTRAP_FILE')) {
+	$bootstrapFile = Environment::getEnv('SERVE_BOOTSTRAP_FILE');
 } else {
 	$bootstrapFile = null;
 }
diff --git a/code/server-handler.php b/code/server-handler.php
index 4095b39..689721d 100644
--- a/code/server-handler.php
+++ b/code/server-handler.php
@@ -6,12 +6,14 @@
  * framework.
  */
 
+use SilverStripe\Core\Environment;
+
 require_once 'constants.php';
 require_once BASE_PATH . '/vendor/autoload.php';
 
 // Include a bootstrap file (e.g. if you need extra settings to get a module started)
-if (getenv('SERVE_BOOTSTRAP_FILE')) {
-    require_once getenv('SERVE_BOOTSTRAP_FILE');
+if (Environment::getEnv('SERVE_BOOTSTRAP_FILE')) {
+    require_once Environment::getEnv('SERVE_BOOTSTRAP_FILE');
 }
 
 $uri = urldecode(