diff --git a/Dockerfile b/Dockerfile
index 4939540..c87af9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,12 +8,13 @@ ARG maintainer=tier
 ARG imagename=shibboleth_idp
 ARG version=3.3.0
 ARG tierversion=17020
+ARG tierbuild=$BUILD_NUMBER
 ENV VERSION=$version
 ENV TIERVERSION=$tierversion
+ENV TIERBUILD=$tierbuild
 ENV IMAGENAME=$imagename
 ENV MAINTAINER=$maintainer
 
-MAINTAINER $maintainer
 LABEL Vendor="Internet2"
 LABEL ImageType="Shibboleth IDP Release"
 LABEL ImageName=$imagename
diff --git a/files/bin/sendtierbeacon.sh b/files/bin/sendtierbeacon.sh
index 841b504..8cfca09 100644
--- a/files/bin/sendtierbeacon.sh
+++ b/files/bin/sendtierbeacon.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 LOGHOST="collector.testbed.tier.internet2.edu"
 LOGPORT="5000"
 if [ -s /opt/tier/env.bash ]; then
diff --git a/files/bin/setenv.sh b/files/bin/setenv.sh
index 8e53f7c..1305645 100644
--- a/files/bin/setenv.sh
+++ b/files/bin/setenv.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^VERSION" > /opt/tier/env.bash
 printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^TIERVERSION" >> /opt/tier/env.bash
 printenv | sed 's/^\(.*\)$/\1/g' | grep -E "^IMAGE" >> /opt/tier/env.bash