diff --git a/images/utility/Dockerfile b/images/utility/Dockerfile
index 32ea5cd5..4382e8c6 100644
--- a/images/utility/Dockerfile
+++ b/images/utility/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y openssh-server python python-pip dnsutils iputils-ping git vim curl util-linux sshpass nano jq
 RUN mkdir /var/run/sshd
@@ -32,10 +32,15 @@ RUN echo "export VISIBLE=now" >> /etc/profile
 ADD requirements.txt /requirements.txt
 RUN pip install -r /requirements.txt
 
-# Temporary measure to get the latest yaml fix
+# The latest release of JSNAPy as of now was 1.3.2, released in
+# May of 2018. Since then, there have been many fixes, and the main one we care
+# about is the YAML deprecation notices. I will follow up with them and ask why
+# we haven't done a release in so long with many outstanding fixes already in
+# master, but in the meantime, we will clone and check out a commit manually so
+# we can avoid the YAML deprecation notices 
 RUN git clone https://github.com/Juniper/jsnapy.git /tmp/jsnapy \
     && cd /tmp/jsnapy \
-    && git checkout dd0dbb12e47ec5183e9e2ac9cd99195c861c925e \
+    && git checkout bb8e02b1a9bd0e981c7d9a18cd1a08f5596cac65 \
     && python setup.py install
 
 EXPOSE 22
diff --git a/images/utility/motd.sh b/images/utility/motd.sh
index f7b98511..f6811ba2 100755
--- a/images/utility/motd.sh
+++ b/images/utility/motd.sh
@@ -1,12 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
-printf "\n"
-printf " ###############################################################\n"
-printf " #                     WELCOME TO ANTIDOTE                     #\n"            
-printf " #                                                             #\n"
-printf " # This is the 'utility' container. This is used to run Python #\n"
-printf " # scripts, workflows, tools, commands, etc - anything needed  #\n"
-printf " # to perform automation tasks on our network devices.         #\n"
-printf " #                                                             #\n"
-printf " # Documentation: https://antidoteproject.readthedocs.io       #\n"
-printf " ###############################################################\n"
+printf "Welcome to \u001b[1;38;5;36mNRE Labs\033[1m%s\033[0m! \n"
+printf " * Docs - https://docs.nrelabs.io/\n"