diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index d1609418d..e51d436ba 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -40,7 +40,7 @@ docker_manifests:
       - otel/opentelemetry-collector:{{ .Tag }}-amd64
 dockers:
   - image_templates:
-      - "otel/otelcol:{{ .Tag }}-amd64"
+      - "otel/opentelemetry-collector:{{ .Tag }}-amd64"
     dockerfile: "distributions/otelcol/Dockerfile"
     use: buildx
     build_flag_templates:
diff --git a/scripts/goreleaser-templates/docker.template.yaml b/scripts/goreleaser-templates/docker.template.yaml
index 787da6ec8..423bbde1c 100644
--- a/scripts/goreleaser-templates/docker.template.yaml
+++ b/scripts/goreleaser-templates/docker.template.yaml
@@ -1,6 +1,6 @@
 dockers:
 - image_templates:
-    - "otel/{distribution}:{{ .Tag }}-amd64"
+    - "${CONTAINER_BASE_NAME}:{{ .Tag }}-amd64"
   dockerfile: "distributions/{distribution}/Dockerfile"
   use: buildx
   build_flag_templates: