diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
index 5206ae6b4..22420b457 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -36,29 +36,29 @@ import com.netflix.discovery.EurekaClientConfig;
  *
  */
 @Configuration
-@EnableConfigurationProperties({EurekaClientConfigBean.class, EurekaInstanceConfigBean.class})
+@EnableConfigurationProperties({ EurekaClientConfigBean.class,
+		EurekaInstanceConfigBean.class })
 @ConditionalOnClass(EurekaClientConfig.class)
 @ConditionalOnExpression("${eureka.client.enabled:true}")
-public class EurekaClientAutoConfiguration implements ApplicationListener<ContextRefreshedEvent> {
+public class EurekaClientAutoConfiguration implements
+		ApplicationListener<ContextRefreshedEvent> {
 
 	@Autowired
 	private EurekaClientConfigBean clientConfig;
 
 	@Autowired
 	private EurekaInstanceConfigBean instanceConfig;
-	
+
 	@Override
 	public void onApplicationEvent(ContextRefreshedEvent event) {
-		ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP);		
+		ApplicationInfoManager.getInstance().setInstanceStatus(InstanceStatus.UP);
 	}
 
 	@PostConstruct
 	public void init() {
-		DiscoveryManager.getInstance().initComponent(
-				instanceConfig,
-				clientConfig);
+		DiscoveryManager.getInstance().initComponent(instanceConfig, clientConfig);
 	}
-	
+
 	@PreDestroy
 	public void close() {
 		DiscoveryManager.getInstance().shutdownComponent();
diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
index 7f3925c00..62ecf112c 100644
--- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
+++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
@@ -53,7 +53,7 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
     
     private boolean instanceEnabledOnit;
 
-	@Value("${server.port:80}")
+	@Value("${server.port:${SERVER_PORT:${PORT:8080}}}")
     private int nonSecurePort = 80;
 
     private int securePort = 443;