diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 784fca2..d1df902 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,15 +15,14 @@ jobs:
       fail-fast: true
       max-parallel: 1 # take advantage of caching
       matrix:
-        target: [build, bsp]
+        target: [developer, runtime]
         include:
           - os: ubuntu-latest
             platforms: linux/amd64
-            name: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}-${{ matrix.target }}
 
     runs-on: ${{ matrix.os }}
     env:
-      TAGS: ${{ matrix.name }}:${{ github.ref_name }},${{ matrix.name }}:latest
+      TAG: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}-${{ matrix.target }}
     steps:
 
       - name: Log in to GitHub Docker Registry
@@ -40,7 +39,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           target: ${{ matrix.target }}
-          tags: ${{ env.TAGS }}
+          tags: ${{ env.TAG }}:${{ github.ref_name }},${{ env.TAG }}:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
           load: true
@@ -52,6 +51,5 @@ jobs:
         if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
         uses: docker/build-push-action@v5
         with:
-          target: ${{ matrix.target }}
-          tags: ${{ env.TAGS }}
+          tags: ${{ env.TAG }}:${{ github.ref_name }},${{ env.TAG }}:latest
           push: true
diff --git a/Dockerfile b/Dockerfile
index 622303d..c3a6d8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV RTEMS_BASE=/rtems6-${RTEMS_BSP}-legacy
 ENV RTEMS_PREFIX=${RTEMS_BASE}/rtems/${RTEMS_VERSION}
 ENV PATH=${RTEMS_PREFIX}/bin:${PATH}
 
-FROM environment AS build
+FROM environment AS developer
 
 # build tools for x86 including python and busybox (for unzip and others)
 # https://docs.rtems.org/branches/master/user/start/preparation.html#host-computer
@@ -76,7 +76,7 @@ RUN git submodule init && \
     ./waf && \
     ./waf install
 
-from environment AS bsp_prep
+from environment AS runtime_prep
 
 # To make this container target smaller we take just the BSP
 COPY --from=developer ${RTEMS_PREFIX} ${RTEMS_PREFIX}
@@ -88,7 +88,7 @@ RUN rm -r \
     ${RTEMS_PREFIX}/share/info \
     ${RTEMS_PREFIX}/powerpc-rtems6/lib/ldscripts
 
-from runtime_prep AS bsp
+from runtime_prep AS runtime
 
 COPY --from=runtime_prep ${RTEMS_PREFIX} ${RTEMS_PREFIX}