diff --git a/mleap-grpc-server/src/main/resources/application.conf b/mleap-grpc-server/src/main/resources/application.conf
index 2cca8e7b9..4f3dcb4db 100644
--- a/mleap-grpc-server/src/main/resources/application.conf
+++ b/mleap-grpc-server/src/main/resources/application.conf
@@ -1,5 +1,5 @@
 ml.combust.mleap.grpc.server {
-  port = 65327
+  port = 65328
   port = ${?MLEAP_GRPC_PORT}
 
   default {
diff --git a/mleap-serving/src/main/resources/application.conf b/mleap-serving/src/main/resources/application.conf
deleted file mode 100644
index f9b8fc8aa..000000000
--- a/mleap-serving/src/main/resources/application.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-ml.combust.mleap.serving {
-  http {
-    bind-hostname = 0.0.0.0
-    bind-hostname = ${?MLEAP_HTTP_HOSTNAME}
-    bind-port = 65327
-    bind-port = ${?MLEAP_HTTP_PORT}
-  }
-
-  grpc {
-    bind-port = 65328
-    bind-port = ${?MLEAP_GRPC_PORT}
-  }
-}
diff --git a/mleap-spring-boot/src/main/resources/application.yml b/mleap-spring-boot/src/main/resources/application.yml
new file mode 100644
index 000000000..687c2c51e
--- /dev/null
+++ b/mleap-spring-boot/src/main/resources/application.yml
@@ -0,0 +1,3 @@
+server:
+  port: ${MLEAP_HTTP_PORT:65327}
+  address: ${MLEAP_HTTP_HOSTNAME:0.0.0.0}
\ No newline at end of file