try it this way

Author: anthony-nhs

.github/workflows/build_multi_arch_image.yml

@@ -135,6 +135,7 @@ jobs:
           export BUILD_TIMESTAMP
           docker buildx imagetools create \
             --annotation "index:org.opencontainers.image.created=${BUILD_TIMESTAMP}" \
+            --tag "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-${ARCHITECTURE}" \
             "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-${ARCHITECTURE}"
         env:
           DOCKER_TAG: ${{ inputs.docker_tag }}
@@ -178,6 +179,7 @@ jobs:
             --annotation "index:org.opencontainers.image.version=${DOCKER_TAG}" \
             --annotation "index:org.opencontainers.image.containerName=${CONTAINER_NAME}" \
             --annotation "index:org.opencontainers.image.created=${BUILD_TIMESTAMP}" \
+            --annotation "index:org.opencontainers.image.authors=NHS England EPS Team" \
             --tag "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}" \
             "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64" \
             "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64"

src/base/.devcontainer/Dockerfile

@@ -19,6 +19,9 @@ LABEL org.opencontainers.image.description="EPS devcontainer ${CONTAINER_NAME}:$
 LABEL org.opencontainers.image.licenses=MIT
 LABEL org.opencontainers.image.version=${IMAGE_TAG}
 LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
+LABEL org.opencontainers.image.authors="NHS England EPS Team"
+LABEL org.opencontainers.image.base.image="mcr.microsoft.com/devcontainers/base:ubuntu-22.04"
+
 
 
 COPY .tool-versions.asdf ${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf

src/common/Dockerfile

@@ -20,11 +20,9 @@ ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
 ENV IMAGE_TAG=${IMAGE_TAG}
 ENV TARGETARCH=${TARGETARCH}
 
-LABEL org.opencontainers.image.source=https://github.com/NHSDigital/eps-devcontainers
 LABEL org.opencontainers.image.description="EPS devcontainer ${CONTAINER_NAME}:${IMAGE_TAG}"
-LABEL org.opencontainers.image.licenses=MIT
 LABEL org.opencontainers.image.version=${IMAGE_TAG}
-LABEL org.opencontainers.image.baseImage=${BASE_IMAGE}
+LABEL org.opencontainers.image.base.name=${BASE_IMAGE}
 LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
 
 USER root

src/projects/fhir_facade_api/.devcontainer/Dockerfile

@@ -17,11 +17,9 @@ ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
 ENV IMAGE_TAG=${IMAGE_TAG}
 ENV TARGETARCH=${TARGETARCH}
 
-LABEL org.opencontainers.image.source=https://github.com/NHSDigital/eps-devcontainers
 LABEL org.opencontainers.image.description="EPS devcontainer ${CONTAINER_NAME}:${IMAGE_TAG}"
-LABEL org.opencontainers.image.licenses=MIT
 LABEL org.opencontainers.image.version=${IMAGE_TAG}
-LABEL org.opencontainers.image.baseImage=${BASE_IMAGE}
+LABEL org.opencontainers.image.base.name=${BASE_IMAGE}
 LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
 
 USER root