diff --git a/.gitignore b/.gitignore
index 5c0ecf6..f5da358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ build
 .idea
 .gradle
 *.log
-*.iws
\ No newline at end of file
+*.iws
+gradle.properties
\ No newline at end of file
diff --git a/accounts-web-service/build.gradle b/accounts-web-service/build.gradle
index 49c34da..9664c67 100644
--- a/accounts-web-service/build.gradle
+++ b/accounts-web-service/build.gradle
@@ -99,8 +99,8 @@ if (project.hasProperty('production')) {
 cloudfoundry {
     target = 'https://api.run.pivotal.io'
     application = 'accounts'
-    username = 'john.smart@wakaleo.com'
-    password = 'nos-bak-yac-yu-i'
+    username = cfUsername
+    password = cfPassword
     file = file("${jar.archivePath}")
     buildpack = 'https://github.com/cloudfoundry/java-buildpack'
     services {
diff --git a/flights-web-service/build.gradle b/flights-web-service/build.gradle
index 92f9d9d..9460a3c 100644
--- a/flights-web-service/build.gradle
+++ b/flights-web-service/build.gradle
@@ -63,8 +63,8 @@ task integrationTests(type: Test) {
         systemProperty 'mongodb.host', 'ds039020.mongolab.com'
         systemProperty 'mongodb.port', '39020'
         systemProperty 'mongodb.database', 'flyinghigh-integration'
-        systemProperty 'mongodb.username', 'flyinghigh'
-        systemProperty 'mongodb.password', 'flyinghigh'
+        systemProperty 'mongodb.username', mongoUsername
+        systemProperty 'mongodb.password', mongoPassword
     }
 
     include '**/*IT.class'
@@ -97,9 +97,9 @@ if (project.hasProperty('production')) {
 cloudfoundry {
     target = 'https://api.run.pivotal.io'
     application = 'flights'
-    username = 'john.smart@wakaleo.com'
-    password = 'nos-bak-yac-yu-i'
-    file = file("${jar.archivePath}")
+    username = cfUsername
+    password = cfPassword
+     file = file("${jar.archivePath}")
     buildpack = 'https://github.com/cloudfoundry/java-buildpack'
     services {
         'mongodb' {