diff --git a/ansible/beta-hosts/variables b/ansible/beta-hosts/variables
index 398ead09..0828a660 100644
--- a/ansible/beta-hosts/variables
+++ b/ansible/beta-hosts/variables
@@ -55,7 +55,7 @@ datadog_tags=env:beta
 domain=runnable-beta.com
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-beta
-pg_database=shiva
+pg_database=astral
 pg_host=beta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
 pg_pass=QBjSpAXVYwmGHu4Y
 pg_user=shiva
diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml
index bfb0d18e..2adadedb 100644
--- a/ansible/group_vars/alpha-shiva.yml
+++ b/ansible/group_vars/alpha-shiva.yml
@@ -1,10 +1,12 @@
 name: "shiva"
-
 container_image: "registry.runnable.com/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
-repo: "git@github.com:CodeNow/{{ name }}.git"
-node_version: "0.10.38"
-npm_version: "2.1.18"
+repo: "git@github.com:CodeNow/astral.git"
+node_version: "4.2.1"
+npm_version: "2.8.3"
+
+# Overrides the start command in the builder role
+npm_start_command: "run shiva-start"
 
 # Not actually needed, just allows container-kill-start to work
 hosted_ports: ["3000"]
diff --git a/ansible/prod-hosts/variables b/ansible/prod-hosts/variables
index 75ec3570..41054a66 100644
--- a/ansible/prod-hosts/variables
+++ b/ansible/prod-hosts/variables
@@ -55,7 +55,7 @@ datadog_tags=env:alpha
 domain=runnable.io
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production
-pg_database=shiva
+pg_database=astral
 pg_host=alpha-production-db.czw5moz6rmpp.us-west-1.rds.amazonaws.com:30573
 pg_pass=wCJGCfCWE9CKmQwa2XUKj6d8WYcEZAb9
 pg_user=shiva
diff --git a/ansible/roles/builder/defaults/main.yml b/ansible/roles/builder/defaults/main.yml
index 9caab169..cef01800 100644
--- a/ansible/roles/builder/defaults/main.yml
+++ b/ansible/roles/builder/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 build_dir: /opts/builds/docker_build/
+npm_start_command: start
diff --git a/ansible/roles/builder/templates/basic_node/Dockerfile b/ansible/roles/builder/templates/basic_node/Dockerfile
index 786a6776..98f3a6bc 100644
--- a/ansible/roles/builder/templates/basic_node/Dockerfile
+++ b/ansible/roles/builder/templates/basic_node/Dockerfile
@@ -34,4 +34,4 @@ RUN {{ command }}
 {% endif %}
 
 # Define default command.
-CMD ulimit -c unlimited && /usr/local/bin/npm start > /var/log/{{ name }}.log 2>&1
+CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command }} > /var/log/{{ name }}.log 2>&1