diff --git a/app/uk/gov/hmrc/helptosavetestadminfrontend/config/AppConfig.scala b/app/uk/gov/hmrc/helptosavetestadminfrontend/config/AppConfig.scala
index 6947047..7261a37 100644
--- a/app/uk/gov/hmrc/helptosavetestadminfrontend/config/AppConfig.scala
+++ b/app/uk/gov/hmrc/helptosavetestadminfrontend/config/AppConfig.scala
@@ -16,8 +16,6 @@
 
 package uk.gov.hmrc.helptosavetestadminfrontend.config
 
-import java.net.URLEncoder
-
 import javax.inject.{Inject, Singleton}
 import play.api.Mode.Mode
 import play.api.{Configuration, Environment}
@@ -34,15 +32,15 @@ class AppConfig @Inject()(val runModeConfiguration: Configuration, environment:
   val clientId: String = getString("microservice.services.oauth-frontend.client_id")
   val clientSecret: String = getString("microservice.services.oauth-frontend.client_secret")
 
-  val adminFrontendUrl: String = getString("microservice.services.help-to-save-test-admin-frontend.url")
+  val adminFrontendUrl: String = baseUrl("help-to-save-test-admin-frontend")
 
   val authorizeCallback: String = s"$adminFrontendUrl/help-to-save-test-admin-frontend/authorize-callback"
 
   val apiUrl: String = getString("microservice.services.api.url")
 
-  val oauthURL: String = getString("microservice.services.oauth-frontend.url")
+  val oauthURL: String = baseUrl("oauth-frontend")
 
-  val authStubUrl: String = s"${getString("microservice.services.auth-login-stub.url")}/auth-login-stub/gg-sign-in"
+  val authStubUrl: String = s"${baseUrl("auth-login-stub")}/auth-login-stub/gg-sign-in"
 
   val scopes = "read:help-to-save write:help-to-save"
 
diff --git a/conf/application.conf b/conf/application.conf
index 9069b1d..17d26b3 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -61,17 +61,20 @@ microservice {
   services {
 
     oauth-frontend {
-      url: "http://localhost:9610"
+      host: "localhost"
+      port: 9610
       client_id = "test"
       client_secret = "test"
     }
 
     auth-login-stub {
-      url: "http://localhost:9949"
+      host: "localhost"
+      port: 9949
     }
 
     help-to-save-test-admin-frontend {
-      url: "http://localhost:7009"
+      host: "localhost:7009"
+      port: 7009
     }
 
     api {