diff --git a/shipyard_airflow/control/configdocs/configdocs_helper.py b/shipyard_airflow/control/configdocs/configdocs_helper.py
index 94f29b9f..d353c418 100644
--- a/shipyard_airflow/control/configdocs/configdocs_helper.py
+++ b/shipyard_airflow/control/configdocs/configdocs_helper.py
@@ -437,8 +437,13 @@ class ConfigdocsHelper(object):
                 'content-type': 'application/json'
             }
 
+            # TODO: We will need to make timeout a configurable value as it
+            # will differ from site to site based on the size of the rendered
+            # document
+            # Note that 30 seconds is not sufficient to complete validations.
+            # Hence we are increaing the default timeout to 60 seconds.
             http_resp = requests.post(
-                url, headers=headers, data=design_reference, timeout=(5, 30))
+                url, headers=headers, data=design_reference, timeout=(5, 60))
             # 400 response is "valid" failure to validate. > 400 is a problem.
             if http_resp.status_code > 400:
                 http_resp.raise_for_status()
diff --git a/tools/deckhand_load_yaml.sh b/tools/deckhand_load_yaml.sh
index dff4ab4c..f88275c5 100755
--- a/tools/deckhand_load_yaml.sh
+++ b/tools/deckhand_load_yaml.sh
@@ -60,6 +60,7 @@ ingress_controller_ip=`sudo kubectl get pods -n openstack -o wide | grep ingress
 # where DNS resolution of the Keystone and Shipyard URLs
 # is not available. We can skip this step if DNS is in place.
 cat << EOF | sudo tee -a /etc/hosts
+
 $ingress_controller_ip keystone.${namespace}
 $ingress_controller_ip shipyard-api.${namespace}.svc.cluster.local
 EOF
@@ -72,6 +73,14 @@ sudo pip3 install --upgrade pip
 cd shipyard && sudo pip3 install -r requirements.txt
 sudo python3 setup.py install
 
+# Export Environment Variables
+export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME}
+export OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME}
+export OS_PROJECT_NAME=${OS_PROJECT_NAME}
+export OS_USERNAME=${OS_USERNAME}
+export OS_PASSWORD=${OS_PASSWORD}
+export OS_AUTH_URL=${OS_AUTH_URL}
+
 # The directory will contain all the .yaml files with Drydock, Promenade,
 # Armada, and Divingbell configurations. It will also contain all the
 # secrets such as certificates, CAs and passwords.