diff --git a/ex101/ex101.1.1/Dockerfile b/ex101/ex101.1.1/Dockerfile
index 31dfed1..5356382 100644
--- a/ex101/ex101.1.1/Dockerfile
+++ b/ex101/ex101.1.1/Dockerfile
@@ -14,8 +14,10 @@ COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-IN
 COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 
+# && setupFiles; \
+
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.1.1/Dockerfile b/ex201/ex201.1.1/Dockerfile
index 7cd1f94..8ceab96 100644
--- a/ex201/ex201.1.1/Dockerfile
+++ b/ex201/ex201.1.1/Dockerfile
@@ -14,8 +14,9 @@ COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-IN
 COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.1.end/Dockerfile b/ex201/ex201.1.end/Dockerfile
index 3649b2a..02068fb 100644
--- a/ex201/ex201.1.end/Dockerfile
+++ b/ex201/ex201.1.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.1.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.2.1/Dockerfile b/ex201/ex201.2.1/Dockerfile
index 39010d6..260c051 100644
--- a/ex201/ex201.2.1/Dockerfile
+++ b/ex201/ex201.2.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.2.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.2.end/Dockerfile b/ex201/ex201.2.end/Dockerfile
index 90dc23a..f29ee11 100644
--- a/ex201/ex201.2.end/Dockerfile
+++ b/ex201/ex201.2.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.2.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.3.1/Dockerfile b/ex201/ex201.3.1/Dockerfile
index 8c05de3..01027b5 100644
--- a/ex201/ex201.3.1/Dockerfile
+++ b/ex201/ex201.3.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.3.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.3.end/Dockerfile b/ex201/ex201.3.end/Dockerfile
index 50ed169..08a8e65 100644
--- a/ex201/ex201.3.end/Dockerfile
+++ b/ex201/ex201.3.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.3.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.4.1/Dockerfile b/ex201/ex201.4.1/Dockerfile
index 8478ec2..9befae5 100644
--- a/ex201/ex201.4.1/Dockerfile
+++ b/ex201/ex201.4.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.4.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.4.end/Dockerfile b/ex201/ex201.4.end/Dockerfile
index f7e6659..bb51e3d 100644
--- a/ex201/ex201.4.end/Dockerfile
+++ b/ex201/ex201.4.end/Dockerfile
@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-201.4.end
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/attribute-filter.xml /opt/shibboleth-idp/conf/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.5.1/Dockerfile b/ex201/ex201.5.1/Dockerfile
index 3e89181..2dd3cc1 100644
--- a/ex201/ex201.5.1/Dockerfile
+++ b/ex201/ex201.5.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.5.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex201/ex201.5.end/Dockerfile b/ex201/ex201.5.end/Dockerfile
index b4451c9..7423660 100644
--- a/ex201/ex201.5.end/Dockerfile
+++ b/ex201/ex201.5.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.5.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex211/ex211.1.1/Dockerfile b/ex211/ex211.1.1/Dockerfile
index bcc7b45..25187ac 100644
--- a/ex211/ex211.1.1/Dockerfile
+++ b/ex211/ex211.1.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-211.1.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex301/ex301.4.1/Dockerfile b/ex301/ex301.4.1/Dockerfile
index 5636931..51e1bf2 100644
--- a/ex301/ex301.4.1/Dockerfile
+++ b/ex301/ex301.4.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-301.4.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.1/Dockerfile b/ex401/ex401.1.1/Dockerfile
index 0537395..532f34a 100644
--- a/ex401/ex401.1.1/Dockerfile
+++ b/ex401/ex401.1.1/Dockerfile
@@ -16,8 +16,9 @@ COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/class
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 COPY container_files/grouper.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.2/Dockerfile b/ex401/ex401.1.2/Dockerfile
index aaea51b..078f91e 100644
--- a/ex401/ex401.1.2/Dockerfile
+++ b/ex401/ex401.1.2/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.3/Dockerfile b/ex401/ex401.1.3/Dockerfile
index d70238b..756a81e 100644
--- a/ex401/ex401.1.3/Dockerfile
+++ b/ex401/ex401.1.3/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.4/Dockerfile b/ex401/ex401.1.4/Dockerfile
index ba01a46..f145d2a 100644
--- a/ex401/ex401.1.4/Dockerfile
+++ b/ex401/ex401.1.4/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.4
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.5/Dockerfile b/ex401/ex401.1.5/Dockerfile
index 8f777aa..13142fb 100644
--- a/ex401/ex401.1.5/Dockerfile
+++ b/ex401/ex401.1.5/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.1.end/Dockerfile b/ex401/ex401.1.end/Dockerfile
index 955d983..0edae48 100644
--- a/ex401/ex401.1.end/Dockerfile
+++ b/ex401/ex401.1.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.1/Dockerfile b/ex401/ex401.2.1/Dockerfile
index 991b01f..efa92bf 100644
--- a/ex401/ex401.2.1/Dockerfile
+++ b/ex401/ex401.2.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.2/Dockerfile b/ex401/ex401.2.2/Dockerfile
index e135f23..4a0bd39 100644
--- a/ex401/ex401.2.2/Dockerfile
+++ b/ex401/ex401.2.2/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.3/Dockerfile b/ex401/ex401.2.3/Dockerfile
index b755eb2..bde59eb 100644
--- a/ex401/ex401.2.3/Dockerfile
+++ b/ex401/ex401.2.3/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.4/Dockerfile b/ex401/ex401.2.4/Dockerfile
index 1cebcbb..1c44768 100644
--- a/ex401/ex401.2.4/Dockerfile
+++ b/ex401/ex401.2.4/Dockerfile
@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-401.2.4
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/idp/ /opt/shibboleth-idp/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.5/Dockerfile b/ex401/ex401.2.5/Dockerfile
index f3b671e..3815124 100644
--- a/ex401/ex401.2.5/Dockerfile
+++ b/ex401/ex401.2.5/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.6/Dockerfile b/ex401/ex401.2.6/Dockerfile
index fdd807e..e2573f1 100644
--- a/ex401/ex401.2.6/Dockerfile
+++ b/ex401/ex401.2.6/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.6
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.7/Dockerfile b/ex401/ex401.2.7/Dockerfile
index 4afbe9d..2e84e3f 100644
--- a/ex401/ex401.2.7/Dockerfile
+++ b/ex401/ex401.2.7/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.7
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.8/Dockerfile b/ex401/ex401.2.8/Dockerfile
index a0e1192..589b705 100644
--- a/ex401/ex401.2.8/Dockerfile
+++ b/ex401/ex401.2.8/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.8
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.9/Dockerfile b/ex401/ex401.2.9/Dockerfile
index 3491f2c..7ffef58 100644
--- a/ex401/ex401.2.9/Dockerfile
+++ b/ex401/ex401.2.9/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.9
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.2.end/Dockerfile b/ex401/ex401.2.end/Dockerfile
index 4937628..4bdaf60 100644
--- a/ex401/ex401.2.end/Dockerfile
+++ b/ex401/ex401.2.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.1/Dockerfile b/ex401/ex401.3.1/Dockerfile
index 9d188b1..a20f186 100644
--- a/ex401/ex401.3.1/Dockerfile
+++ b/ex401/ex401.3.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.2/Dockerfile b/ex401/ex401.3.2/Dockerfile
index b0c3f3a..35a2dc9 100644
--- a/ex401/ex401.3.2/Dockerfile
+++ b/ex401/ex401.3.2/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.3/Dockerfile b/ex401/ex401.3.3/Dockerfile
index 789bc0e..23599b3 100644
--- a/ex401/ex401.3.3/Dockerfile
+++ b/ex401/ex401.3.3/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.4/Dockerfile b/ex401/ex401.3.4/Dockerfile
index 4aa4b61..4e0273a 100644
--- a/ex401/ex401.3.4/Dockerfile
+++ b/ex401/ex401.3.4/Dockerfile
@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-401.3.4
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/attribute-filter.xml /opt/shibboleth-idp/conf/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.5/Dockerfile b/ex401/ex401.3.5/Dockerfile
index 23b1443..728fd4b 100644
--- a/ex401/ex401.3.5/Dockerfile
+++ b/ex401/ex401.3.5/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.6/Dockerfile b/ex401/ex401.3.6/Dockerfile
index fe1d689..709144e 100644
--- a/ex401/ex401.3.6/Dockerfile
+++ b/ex401/ex401.3.6/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.6
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.7/Dockerfile b/ex401/ex401.3.7/Dockerfile
index 1d7312a..48bdf76 100644
--- a/ex401/ex401.3.7/Dockerfile
+++ b/ex401/ex401.3.7/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.7
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.3.end/Dockerfile b/ex401/ex401.3.end/Dockerfile
index fc12e59..0d16252 100644
--- a/ex401/ex401.3.end/Dockerfile
+++ b/ex401/ex401.3.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.4.1/Dockerfile b/ex401/ex401.4.1/Dockerfile
index 5380247..3d79565 100644
--- a/ex401/ex401.4.1/Dockerfile
+++ b/ex401/ex401.4.1/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.4.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/ex401/ex401.4.end/Dockerfile b/ex401/ex401.4.end/Dockerfile
index dee6522..fda25fb 100644
--- a/ex401/ex401.4.end/Dockerfile
+++ b/ex401/ex401.4.end/Dockerfile
@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.4.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \
diff --git a/full-demo/Dockerfile b/full-demo/Dockerfile
index ae81d0e..709f6e3 100644
--- a/full-demo/Dockerfile
+++ b/full-demo/Dockerfile
@@ -13,8 +13,9 @@ COPY container_files/demo.gsh /seed-data/
 COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \