diff --git a/ex201/ex201.1.end/Dockerfile b/ex201/ex201.1.end/Dockerfile
index 3f7701a..0421a48 100644
--- a/ex201/ex201.1.end/Dockerfile
+++ b/ex201/ex201.1.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.1.1
+ARG VERSION_TAG
+FROM tier/gte:201.1.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.2.1/Dockerfile b/ex201/ex201.2.1/Dockerfile
index 053c7a3..3069cbf 100644
--- a/ex201/ex201.2.1/Dockerfile
+++ b/ex201/ex201.2.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.1.end
+ARG VERSION_TAG
+FROM tier/gte:201.1.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.2.end/Dockerfile b/ex201/ex201.2.end/Dockerfile
index efb88df..4405452 100644
--- a/ex201/ex201.2.end/Dockerfile
+++ b/ex201/ex201.2.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.2.1
+ARG VERSION_TAG
+FROM tier/gte:201.2.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.3.1/Dockerfile b/ex201/ex201.3.1/Dockerfile
index 029b891..f59954d 100644
--- a/ex201/ex201.3.1/Dockerfile
+++ b/ex201/ex201.3.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.2.end
+ARG VERSION_TAG
+FROM tier/gte:201.2.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.3.end/Dockerfile b/ex201/ex201.3.end/Dockerfile
index c8c5362..97dc15a 100644
--- a/ex201/ex201.3.end/Dockerfile
+++ b/ex201/ex201.3.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.3.1
+ARG VERSION_TAG
+FROM tier/gte:201.3.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.4.1/Dockerfile b/ex201/ex201.4.1/Dockerfile
index d161570..a08c471 100644
--- a/ex201/ex201.4.1/Dockerfile
+++ b/ex201/ex201.4.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.3.end
+ARG VERSION_TAG
+FROM tier/gte:201.3.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.4.end/Dockerfile b/ex201/ex201.4.end/Dockerfile
index 9e0e4f3..b00db5b 100644
--- a/ex201/ex201.4.end/Dockerfile
+++ b/ex201/ex201.4.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.4.1
+ARG VERSION_TAG
+FROM tier/gte:201.4.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.5.1/Dockerfile b/ex201/ex201.5.1/Dockerfile
index 30d8c78..f001123 100644
--- a/ex201/ex201.5.1/Dockerfile
+++ b/ex201/ex201.5.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.4.end
+ARG VERSION_TAG
+FROM tier/gte:201.4.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/ex201/ex201.5.end/Dockerfile b/ex201/ex201.5.end/Dockerfile
index f795c84..4e0f20b 100644
--- a/ex201/ex201.5.end/Dockerfile
+++ b/ex201/ex201.5.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex201.5.1
+ARG VERSION_TAG
+FROM tier/gte:201.5.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \