diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
index 0fe3d29d2..33a29a47d 100644
--- a/docker/Dockerfile.flux
+++ b/docker/Dockerfile.flux
@@ -17,18 +17,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./kustomize /usr/local/bin
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux" \
-      org.opencontainers.image.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The GitOps operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux" \
-      org.label-schema.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The GitOps operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "fluxd" ]
 
diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator
index 9b70a9e62..dcaa7ef7e 100644
--- a/docker/Dockerfile.helm-operator
+++ b/docker/Dockerfile.helm-operator
@@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./helm /usr/local/bin/
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux-helm-operator" \
-      org.opencontainers.image.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The Helm operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux-helm-operator" \
-      org.label-schema.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The Helm operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "helm-operator" ]