diff --git a/exercise1/Dockerfile b/exercise1/Dockerfile
index a6fa7ad..ca3ef88 100644
--- a/exercise1/Dockerfile
+++ b/exercise1/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper_training_base:latest
+FROM tier/grouper_training_env:base
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/exercise2/Dockerfile b/exercise2/Dockerfile
index 790d326..1eabc12 100644
--- a/exercise2/Dockerfile
+++ b/exercise2/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper_training_base:latest
+FROM tier/grouper_training_env:base
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/full-demo/Dockerfile b/full-demo/Dockerfile
index 97e85c6..be6898a 100644
--- a/full-demo/Dockerfile
+++ b/full-demo/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper_training_base:latest
+FROM tier/grouper_training_env:base
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
diff --git a/manualBuild.sh b/manualBuild.sh
index 9a25327..8c710d9 100755
--- a/manualBuild.sh
+++ b/manualBuild.sh
@@ -1,7 +1,7 @@
-docker build --tag=tier/grouper_training_base:latest base/ \
-&& docker build --tag=tier/grouper_training_ex1:latest exercise1 \
-&& docker build --tag=tier/grouper_training_ex2:latest exercise2 \
-&& docker build --tag=tier/grouper_training_full_demo:latest full-demo
+docker build --tag=tier/grouper_training_env:base base/ \
+&& docker build --tag=tier/grouper_training_env:ex1 exercise1 \
+&& docker build --tag=tier/grouper_training_env:ex2 exercise2 \
+&& docker build --tag=tier/grouper_training_env:full_demo full-demo
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   say build complete