diff --git a/build.sh b/build.sh
index eb8b1e4..55e6413 100755
--- a/build.sh
+++ b/build.sh
@@ -57,7 +57,7 @@ if [ "$EVENT_TYPE" = "cron" ]  || [ "$DEV" = "true" ]; then
 			-t maxking/postorius:rolling postorius/
 else
     # Do the normal building process.
-    $DOCKER build -t maxking/mailman-core core/
-    $DOCKER build -t maxking/mailman-web web/
-    $DOCKER build -t maxking/postorius postorius/
+    $DOCKER build -t maxking/mailman-core:rolling core/
+    $DOCKER build -t maxking/mailman-web:rolling web/
+    $DOCKER build -t maxking/postorius:rolling postorius/
 fi
diff --git a/tests/generate_tests.sh b/tests/generate_tests.sh
index 58e0f10..f62a5d9 100644
--- a/tests/generate_tests.sh
+++ b/tests/generate_tests.sh
@@ -13,10 +13,10 @@ version: '2'
 
 services:
   mailman-core:
-    image: maxking/mailman-core:$TAG
+    image: maxking/mailman-core:rolling
 
   mailman-web:
-    image: maxking/mailman-web:$TAG
+    image: maxking/mailman-web:rolling
     environment:
     - SECRET_KEY=abcdefghijklmnopqrstuv
 EOF