diff --git a/applications/allocations-server/src/main/resources/application.properties b/applications/allocations-server/src/main/resources/application.properties
index 4b8fe6f..25345c2 100644
--- a/applications/allocations-server/src/main/resources/application.properties
+++ b/applications/allocations-server/src/main/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8081
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/allocations-server/src/test/resources/application.properties b/applications/allocations-server/src/test/resources/application.properties
index 4621299..8f936ec 100644
--- a/applications/allocations-server/src/test/resources/application.properties
+++ b/applications/allocations-server/src/test/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/backlog-server/src/main/resources/application.properties b/applications/backlog-server/src/main/resources/application.properties
index cbf1a24..2d4285a 100644
--- a/applications/backlog-server/src/main/resources/application.properties
+++ b/applications/backlog-server/src/main/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8082
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/backlog-server/src/test/resources/application.properties b/applications/backlog-server/src/test/resources/application.properties
index 9fbc62b..d1919e2 100644
--- a/applications/backlog-server/src/test/resources/application.properties
+++ b/applications/backlog-server/src/test/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/registration-server/src/main/resources/application.properties b/applications/registration-server/src/main/resources/application.properties
index c4d175b..f694d56 100644
--- a/applications/registration-server/src/main/resources/application.properties
+++ b/applications/registration-server/src/main/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8083
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/registration-server/src/test/resources/application.properties b/applications/registration-server/src/test/resources/application.properties
index 7e87d44..b5c41e5 100644
--- a/applications/registration-server/src/test/resources/application.properties
+++ b/applications/registration-server/src/test/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/timesheets-server/src/main/resources/application.properties b/applications/timesheets-server/src/main/resources/application.properties
index 9b1be4c..a5f6df5 100644
--- a/applications/timesheets-server/src/main/resources/application.properties
+++ b/applications/timesheets-server/src/main/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8084
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
-management.security.enabled=false
\ No newline at end of file
+management.security.enabled=false
diff --git a/applications/timesheets-server/src/test/resources/application.properties b/applications/timesheets-server/src/test/resources/application.properties
index 59c7370..d641a85 100644
--- a/applications/timesheets-server/src/test/resources/application.properties
+++ b/applications/timesheets-server/src/test/resources/application.properties
@@ -4,6 +4,5 @@ server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
 registration.server.endpoint=http://registration-server
-
 security.basic.enabled=false
 management.security.enabled=false
diff --git a/build.gradle b/build.gradle
index f77cb6e..64edcde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         springBootVersion = "1.5.7.RELEASE"
         springVersion = "4.3.8.RELEASE"
         mysqlVersion = "8.0.11"
-        springCloudDependenciesVersion = "Edgware.SR3"
-        springCloudServicesVersion = "1.6.1.RELEASE"
+        springCloudDependenciesVersion = "Edgware.RELEASE"
+        springCloudServicesVersion = "1.6.0.RELEASE"
     }
 
     repositories {
diff --git a/integration-test/src/test/java/test/pivotal/pal/tracker/support/ApplicationServer.java b/integration-test/src/test/java/test/pivotal/pal/tracker/support/ApplicationServer.java
index 1797937..34a7550 100644
--- a/integration-test/src/test/java/test/pivotal/pal/tracker/support/ApplicationServer.java
+++ b/integration-test/src/test/java/test/pivotal/pal/tracker/support/ApplicationServer.java
@@ -37,7 +37,6 @@ public void startWithDatabaseName(String dbName) throws IOException, Interrupted
 
         start(envMapBuilder()
             .put("SPRING_DATASOURCE_URL", dbUrl)
-            .put("REGISTRATION_SERVER_ENDPOINT", "http://localhost:8883")
             .put("EUREKA_CLIENT_ENABLED", "false")
             .put("RIBBON_EUREKA_ENABLED", "false")
             .put("REGISTRATION_SERVER_RIBBON_LISTOFSERVERS", "http://localhost:8883")
@@ -49,7 +48,6 @@ public void stop() {
         serverProcess.destroyForcibly();
     }
 
-
     public static void waitOnPorts(String... ports) throws InterruptedException {
         for (String port : ports) waitUntilServerIsUp(port);
     }
diff --git a/manifest-allocations.yml b/manifest-allocations.yml
index d0039e2..8ea0e2a 100644
--- a/manifest-allocations.yml
+++ b/manifest-allocations.yml
@@ -5,7 +5,6 @@ applications:
   - route: allocations-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-allocations-database
+  - tracker-service-registry
diff --git a/manifest-backlog.yml b/manifest-backlog.yml
index 3ffb657..b0c8af4 100644
--- a/manifest-backlog.yml
+++ b/manifest-backlog.yml
@@ -5,7 +5,6 @@ applications:
   - route: backlog-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-backlog-database
+  - tracker-service-registry
diff --git a/manifest-registration.yml b/manifest-registration.yml
index 64e25e6..54946c8 100644
--- a/manifest-registration.yml
+++ b/manifest-registration.yml
@@ -7,3 +7,4 @@ applications:
   instances: 1
   services:
   - tracker-registration-database
+  - tracker-service-registry
diff --git a/manifest-timesheets.yml b/manifest-timesheets.yml
index 98adef8..ad1f0f3 100644
--- a/manifest-timesheets.yml
+++ b/manifest-timesheets.yml
@@ -5,7 +5,6 @@ applications:
   - route: timesheets-pal-hot-tea.cfapps.io
   memory: 1G
   instances: 1
-  env:
-    REGISTRATION_SERVER_ENDPOINT: http://registration-pal-hot-tea.cfapps.io
   services:
   - tracker-timesheets-database
+  - tracker-service-registry
diff --git a/platform-services/eureka-server/src/main/resources/application.properties b/platform-services/eureka-server/src/main/resources/application.properties
new file mode 100644
index 0000000..699417a
--- /dev/null
+++ b/platform-services/eureka-server/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+spring.application.name=eureka-server
+server.port=8761