diff --git a/docker/credentials.py b/docker/credentials.py
index e23eb6b..688b23e 100644
--- a/docker/credentials.py
+++ b/docker/credentials.py
@@ -4,7 +4,7 @@ import string
 from os import environ as env
 
 debug = env.get('DEBUG', 'true').lower() == 'true'
-rabbitmq_host = env.get('RABBITMQ_HOST', 'rabbitmq')
+rabbitmq_host = env.get('RABBITMQ_HOST', 'localhost')
 backend = env.get('BACKEND', 'postgresql')
 db_name = env.get('DB_NAME', 'ottertune')
 db_host = env.get('DB_HOST', 'localhost')
diff --git a/docker/install.sh b/docker/install.sh
index b842d1a..97ddef7 100644
--- a/docker/install.sh
+++ b/docker/install.sh
@@ -30,7 +30,7 @@ pip_reqs_file="/${service}-requirements.txt"
 
 if [ "$service" = "base" ]
 then
-    apt_pkgs="python3.6 python3-setuptools python3-pip libssl-dev"
+    apt_pkgs="python3.6 python3-setuptools python3-pip libssl-dev vim dnsutils iputils-ping"
 
     # Filter common pip packages
     for pip_pkg in $pip_common_pkgs