diff --git a/.github/workflows/containers.yaml b/.github/workflows/containers.yaml
index 2bcc0fa..30a35b2 100644
--- a/.github/workflows/containers.yaml
+++ b/.github/workflows/containers.yaml
@@ -36,7 +36,7 @@ jobs:
         if [[ -n "${{ secrets.IMAGE_REPO }}" ]]; then
           IMAGE_REPO="${{ secrets.IMAGE_REPO }}"
         fi
-        QUAY_IMAGE="quay.io/${IMAGE_REPO}/${IMAGE_NAME}-${{ matrix.container }}"
+        QUAY_IMAGE="quay.io/${IMAGE_REPO}/${IMAGE_NAME}:${{ matrix.container }}"
         GHCR_IMAGE="ghcr.io/${{ github.repository }}-${{ matrix.container }}"
         VERSION="dev"
         if [[ '${{ needs.prebuild.outputs.version }}'  != '' ]]; then
@@ -45,9 +45,9 @@ jobs:
         if [ "${{ github.event_name }}" = "schedule" ]; then
           VERSION="nightly"
         fi
-        TAGS="${QUAY_IMAGE}:${VERSION},${GHCR_IMAGE}:${VERSION}"
+        TAGS="${QUAY_IMAGE},${GHCR_IMAGE}:${VERSION}"
         if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-          TAGS="$TAGS,${QUAY_IMAGE}:latest,${GHCR_IMAGE}:latest"
+          TAGS="$TAGS,${GHCR_IMAGE}:latest"
         fi
         echo "settings tag ${TAGS}"
         echo "tags=${TAGS}" >> $GITHUB_OUTPUT
diff --git a/dapr-distributed-calendar/README.md b/dapr-distributed-calendar/README.md
index eb7d68b..222fd4b 100644
--- a/dapr-distributed-calendar/README.md
+++ b/dapr-distributed-calendar/README.md
@@ -104,7 +104,7 @@ a different language. I'll detail the implementation below.
 
 * **Event Service** (written in Go):
   This service uses the statestore component Redis for storing and deleting events from memory. The code snippet shown below is from 
-  `go_events.go` and demonstrates adding an event to the state store. 
+  `go_events.go` and demonstrates adding an event to the state store.
 
   ```go
    var data = make([]map[string]string, 1)