diff --git a/Dockerfile b/Dockerfile
index e0c835408d4e7122c66830648acdd5a5e98947f3..558a3a17d422c16e45390a21fe86e9ae49a085fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@
 #   --build-arg OVERLAY_MIXINS ./
 ARG FROM_IMAGE=osrf/ros2:nightly
 
-# multi-stage build for caching
-FROM $FROM_IMAGE as cache
+# multi-stage for caching
+FROM $FROM_IMAGE AS cache
 WORKDIR /tmp
 
 # copy package manifests for caching
@@ -20,8 +20,8 @@ RUN mkdir ./cache && cd ./src && \
     find ./ -name "COLCON_IGNORE" | \
       xargs cp --parents -t ../cache
 
-# multi-stage build for compiling
-FROM $FROM_IMAGE
+# multi-stage for building
+FROM $FROM_IMAGE AS build
 
 # install CI dependencies	
 RUN apt-get update && \