diff --git a/Dockerfile b/Dockerfile
index 6723853c..36f208d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,4 +130,6 @@ WORKDIR /opt/grouper/grouper.apiBinary/
 
 EXPOSE 80 443
 
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
 CMD ["bin/gsh", "-loader"]
diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon
index 27f3da63..60ebd468 100755
--- a/container_files/usr-local-bin/daemon
+++ b/container_files/usr-local-bin/daemon
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-. /usr/local/bin/library.sh
-
-prepDaemon
-
 export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 
 exec bin/gsh -loader > /tmp/loggrouper
diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
new file mode 100755
index 00000000..bf4bfd69
--- /dev/null
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. /usr/local/bin/library.sh
+prepDaemon
+
+exec "$@"
\ No newline at end of file
diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh
index 0539b40a..589a1838 100755
--- a/container_files/usr-local-bin/gsh
+++ b/container_files/usr-local-bin/gsh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-. /usr/local/bin/library.sh
-
-prepDaemon
-
 export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 
 exec bin/gsh "$@" | tee /tmp/loggrouper
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
old mode 100644
new mode 100755
diff --git a/container_files/usr-local-bin/ui b/container_files/usr-local-bin/ui
index a03ed585..c8895168 100755
--- a/container_files/usr-local-bin/ui
+++ b/container_files/usr-local-bin/ui
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. /usr/local/bin/library.sh
-
 prepUI
 
 export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
diff --git a/container_files/usr-local-bin/ui-ws b/container_files/usr-local-bin/ui-ws
index de1384c4..8defab26 100755
--- a/container_files/usr-local-bin/ui-ws
+++ b/container_files/usr-local-bin/ui-ws
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. /usr/local/bin/library.sh
-
 prepUI
 prepWS
 
diff --git a/container_files/usr-local-bin/ws b/container_files/usr-local-bin/ws
index 0e10b688..51632529 100755
--- a/container_files/usr-local-bin/ws
+++ b/container_files/usr-local-bin/ws
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. /usr/local/bin/library.sh
-
 prepWS
 
 exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomcat.conf
diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile
index 35317837..85b4e261 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -36,8 +36,8 @@ RUN useradd ldapadmin \
     && sed -i '/if (@errs = startServer($inf))/,/}/d' /usr/lib64/dirsrv/perl/* \
     && setup-ds.pl --silent --file /seed-data/ds-setup.inf \
     && /usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir \ 
-    && sleep 3 \
-    && ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password
+    && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
+    ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password
 
 RUN (/usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \