diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index 801c986a754..c96747f090c 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -71,6 +71,10 @@ default: jdk
 all: images docs
 	@$(call CheckIfMakeAtEnd)
 
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
+  all: overlay-images
+endif
+
 start-make:
 	@$(call AtMakeStart)