diff --git a/.cfignore b/.cfignore
index 4957600c..a04f0363 100644
--- a/.cfignore
+++ b/.cfignore
@@ -1,4 +1,34 @@
-node_modules
-.nyc_output
-build/coverage
-build/test-results
+.codeclimate.yml
+.csslintrc
+.dockerignore
+.env
+.env-example
+.eslintrc
+.eslintignore
+.jshintrc
+.gitignore
+.gitallowed
+
+BRANCHING.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+ISSUE_TEMPLATE.md
+LICENSE.md
+procedures.md
+PULL_REQUEST_TEMPLATE.md
+README.md
+STYLEGUIDE.md
+TROUBLESHOOTING.md
+test-results.xml
+docker-compose.yml
+Dockerfile
+
+.circleci/
+.github/
+.gitignore
+.nyc_output/
+.vscode/
+build/*
+docs/
+node_modules/
+test-results/
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/config/index.js b/config/index.js
index 738dc672..d9979cb1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,7 +10,11 @@ const jsonfile = require('jsonfile');
  */
 function getElasticsearchUri(cloudFoundryEnv) {
   if(!cloudFoundryEnv.isLocal){
-    const elasticSearchCredentials = cloudFoundryEnv.getServiceCreds("code_gov_elasticsearch");
+    const serviceName = process.env.ELASTICSEARCH_SERVICE_NAME
+      ? process.env.ELASTICSEARCH_SERVICE_NAME
+      : 'code_gov_elasticsearch';
+
+    const elasticSearchCredentials = cloudFoundryEnv.getServiceCreds(serviceName);
 
     return elasticSearchCredentials.uri
       ? elasticSearchCredentials.uri
diff --git a/BRANCHING.md b/docs/BRANCHING.md
similarity index 100%
rename from BRANCHING.md
rename to docs/BRANCHING.md
diff --git a/CONTRIBUTING.md b/docs/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to docs/CONTRIBUTING.md
diff --git a/STYLEGUIDE.md b/docs/STYLEGUIDE.md
similarity index 100%
rename from STYLEGUIDE.md
rename to docs/STYLEGUIDE.md
diff --git a/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
similarity index 100%
rename from TROUBLESHOOTING.md
rename to docs/TROUBLESHOOTING.md
diff --git a/procedures.md b/docs/procedures.md
similarity index 100%
rename from procedures.md
rename to docs/procedures.md
diff --git a/indexes/term/settings.json b/indexes/term/settings.json
index 9de9041b..ede28278 100644
--- a/indexes/term/settings.json
+++ b/indexes/term/settings.json
@@ -1,5 +1,4 @@
 {
-  "number_of_shards": 1,
   "analysis": {
     "filter": {
       "autocomplete_filter": {
diff --git a/manifest-staging.yml b/manifest-staging.yml
index 58784bee..8b15981b 100644
--- a/manifest-staging.yml
+++ b/manifest-staging.yml
@@ -1,7 +1,7 @@
 applications:
 - name: code-api
   memory: 512M
-  instances: 1
+  instances: 2
   disk_quota: 1024M
   health-check-type: http
   health-check-http-endpoint: /api
@@ -13,7 +13,9 @@ applications:
     CF_STAGING_TIMEOUT: 15
     CF_STARTUP_TIMEOUT: 15
     NODE_ENV: production
+    NEW_RELIC_APP_NAME: code-api-staging
+    ELASTICSEARCH_SERVICE_NAME: code_gov_elasticsearch56
   services:
-  - code_gov_elasticsearch
+  - code_gov_elasticsearch56
   stack: cflinuxfs2
   command: npm start
\ No newline at end of file
diff --git a/scripts/index/index.js b/scripts/index/index.js
index 5fc1978d..fb7c59ce 100644
--- a/scripts/index/index.js
+++ b/scripts/index/index.js
@@ -46,8 +46,6 @@ class Indexer {
 
 }
 
-// If we are running this module directly from Node this code will execute.
-// This will index all items taking our default input.
 if (require.main === module) {
   const config = getConfig(process.env.NODE_ENV);
   let indexer = new Indexer(config);