diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 09823d67f..42c913644 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 # General contribution criteria
 
-Please have a look at our contribution guidelines: https://github.com/weaveworks/flux/blob/master/CONTRIBUTING.md
+Please have a look at our contribution guidelines: https://github.com/fluxcd/flux/blob/master/CONTRIBUTING.md
 Particularly the sections about the:
 
  - DCO;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcac59854..30afee9eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,56 @@
 This is the changelog for the Flux daemon; the changelog for the Helm
 operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
+## 1.13.3 (2019-07-25)
+
+This is a patch release, mostly concerned with adapting documentation
+to Flux's new home in https://github.com/fluxcd/ and the [CNCF
+sandbox](https://www.cncf.io/sandbox-projects/).
+
+### Fixes
+
+- Correct the name of the `--registry-require` argument mentioned in a
+  log message [fluxcd/flux#2256][]
+- Parse Docker credentials that have a host and port, but not a scheme
+  [fluxcd/flux#2248][]
+
+### Maintenance and documentation
+
+- Change references to weaveworks/flux to fluxcd/flux
+  [fluxcd/flux#2240][], [fluxcd/flux#2244][], [fluxcd/flux#2257][],
+  [fluxcd/flux#2271][]
+- Add Walmart to production users (:tada:!) [fluxcd/flux#2268][]
+- Mention the multi-tenancy tutorial in the README
+  [fluxcd/flux#2286][]
+- Fix the filename given in the `.flux.yaml` (manifest generation)
+  docs [fluxcd/flux#2270][]
+- Run credentials tests in parallel, without sleeping
+  [fluxcd/flux#2254][]
+- Correct the Prometheus annotations given in examples
+  [fluxcd/flux#2278][]
+
+### Thanks
+
+Thanks to the following for contributions since the last release:
+@2opremio, @aaron-trout, @adusumillipraveen, @alexhumphreys,
+@aliartiza75, @ariep, @binjheBenjamin, @bricef, @caniszczyk,
+@carlosjgp, @carlpett, @chriscorn-takt, @cloudoutloud, @derrickburns,
+@dholbach, @fnmeissner, @gled4er, @hiddeco, @jmtrusona, @jowparks,
+@jpellizzari, @ksaritek, @ktsakalozos, @mar1n3r0, @mzachh, @primeroz,
+@squaremo, @stefanprodan, @sureshamk, @vyckou, @ybaruchel, @zoni.
+
+[fluxcd/flux#2240]: https://github.com/fluxcd/flux/pull/2240
+[fluxcd/flux#2244]: https://github.com/fluxcd/flux/pull/2244
+[fluxcd/flux#2248]: https://github.com/fluxcd/flux/pull/2248
+[fluxcd/flux#2254]: https://github.com/fluxcd/flux/pull/2254
+[fluxcd/flux#2256]: https://github.com/fluxcd/flux/pull/2256
+[fluxcd/flux#2257]: https://github.com/fluxcd/flux/pull/2257
+[fluxcd/flux#2268]: https://github.com/fluxcd/flux/pull/2268
+[fluxcd/flux#2270]: https://github.com/fluxcd/flux/pull/2270
+[fluxcd/flux#2271]: https://github.com/fluxcd/flux/pull/2271
+[fluxcd/flux#2278]: https://github.com/fluxcd/flux/pull/2278
+[fluxcd/flux#2286]: https://github.com/fluxcd/flux/pull/2286
+
 ## 1.13.2 (2019-07-10)
 
 This is a patch release, including a fix for [problems with using image
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9b02fb39..ab45719fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,14 +35,14 @@ contribution. No action from you is required, but it's a good idea to see the
 ## Communications
 
 The project uses Slack: To join the conversation, simply join the
-[Weave community](https://slack.weave.works/) Slack workspace and use the
-[#flux](https://weave-community.slack.com/messages/flux/) channel.
+[CNCF](https://slack.cncf.io/) Slack workspace and use the
+[#flux](https://cloud-native.slack.com/messages/flux/) channel.
 
 The Flux developers use a mailing list to discuss development as well.
 Simply subscribe to [flux-dev on Google
 Groups](https://groups.google.com/forum/#!forum/flux-dev) to join the
 conversation (this will also add an invitation to your Google calendar
-for our [Flux meeting](https://github.com/weaveworks/flux/wiki/Meeting)).
+for our [Flux meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#)).
 
 ## Getting Started
 
diff --git a/README.md b/README.md
index 9d9d70c4d..950bafa4a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Flux
 
+> **Notice** Flux has moved house! Please see https://github.com/weaveworks/flux/wiki/MoveToFluxCD
+
 We believe in GitOps:
 
 - **You declaratively describe the entire desired state of your
@@ -31,8 +33,8 @@ new infrastructure.
 
 ![Deployment Pipeline](site/images/deployment-pipeline.png)
 
-[![CircleCI](https://circleci.com/gh/weaveworks/flux.svg?style=svg)](https://circleci.com/gh/weaveworks/flux)
-[![GoDoc](https://godoc.org/github.com/weaveworks/flux?status.svg)](https://godoc.org/github.com/weaveworks/flux)
+[![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
+[![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
 
 ## What Flux does
 
@@ -76,6 +78,7 @@ Its major features are:
 - [Troii](https://troii.com/)
 - [Under Armour](https://www.underarmour.com)
 - [VSHN](https://vshn.ch)
+- [Walmart Chile](https://www.walmartchile.cl)
 - [Weave Cloud](https://cloud.weave.works)
 
 If you too are using Flux in production; please submit a PR to add your organization to the list!
@@ -100,7 +103,7 @@ Get started by browsing through the documentation below:
 
 - Background about Flux
   - [Introduction to Flux](/site/introduction.md)
-  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/site/how-it-works.md)
   - [Considerations regarding installing Flux](/site/installing.md)
   - [Flux <-> Helm integration](/site/helm-integration.md)
@@ -112,7 +115,7 @@ Get started by browsing through the documentation below:
   - [Using fluxctl to control Flux](/site/fluxctl.md)
   - [Helm Operator](/site/helm-operator.md)
   - [Troubleshooting](/site/troubleshooting.md)
-  - [Frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [Upgrading to Flux v1](/site/upgrading-to-1.0.md)
 
 ### Integrations
@@ -120,7 +123,8 @@ Get started by browsing through the documentation below:
 As Flux is Open Source, integrations are very straight-forward. Here are
 a few popular ones you might want to check out:
 
-- [Managing Helm releases the GitOps way](https://github.com/stefanprodan/gitops-helm)
+- [Manage a multi-tenant cluster with Flux and Kustomize](https://github.com/fluxcd/multi-tenancy)
+- [Managing Helm releases the GitOps way](https://github.com/fluxcd/helm-operator-get-started)
 - [OpenFaaS GitOps workflow with Flux](https://github.com/stefanprodan/openfaas-flux)
 - [GitOps for Istio Canary deployments](https://github.com/stefanprodan/gitops-istio)
 - [Fluxcloud to receive events from Flux](https://github.com/justinbarrick/fluxcloud)
@@ -130,10 +134,12 @@ a few popular ones you might want to check out:
 We welcome all kinds of contributions to Flux, be it code, issues you found,
 documentation, external tools, help and support or anything else really.
 
+The Flux project adheres to the [CNCF Code of
+Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
 Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by contacting a *Flux* project maintainer, or Alexis
-Richardson `<alexis@weave.works>`. Please refer to our [code of
-conduct](CODE_OF_CONDUCT.md) as well.
+may be reported by contacting a *Flux* project maintainer, or the CNCF
+mediator, Mishi Choudhary <mishi@linux.com>.
 
 To familiarise yourself with the project and how things work, you might
 be interested in the following:
@@ -146,14 +152,12 @@ be interested in the following:
 
 If you have any questions about Flux and continuous delivery:
 
-- Read [the Weave Flux docs](https://github.com/weaveworks/flux/tree/master/site).
-- Invite yourself to the <a href="https://slack.weave.works/" target="_blank">Weave community</a>
-  slack and ask a question on the [#flux](https://weave-community.slack.com/messages/flux/)
+- Read [the Flux docs](https://github.com/fluxcd/flux/tree/master/site).
+- Invite yourself to the <a href="https://slack.cncf.io" target="_blank">CNCF community</a>
+  slack and ask a question on the [#flux](https://cloud-native.slack.com/messages/flux/)
   channel.
 - To be part of the conversation about Flux's development, join the
   [flux-dev mailing list](https://groups.google.com/forum/#!forum/flux-dev).
-- Join the [Weave User Group](https://www.meetup.com/pro/Weave/) and get
-  invited to online talks, hands-on training and meetups in your area.
-- [File an issue.](https://github.com/weaveworks/flux/issues/new)
+- [File an issue.](https://github.com/fluxcd/flux/issues/new)
 
 Your feedback is always welcome!
diff --git a/api/v9/change_test.go b/api/v9/change_test.go
index cdc2c4432..136ff3db3 100644
--- a/api/v9/change_test.go
+++ b/api/v9/change_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestChangeEncoding(t *testing.T) {
-	ref, _ := image.ParseRef("docker.io/weaveworks/flux")
+	ref, _ := image.ParseRef("docker.io/fluxcd/flux")
 	name := ref.Name
 
 	for _, update := range []Change{
diff --git a/chart/flux/README.md b/chart/flux/README.md
index 1353abe89..de0fb67e2 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -183,7 +183,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 
 | Parameter                                         | Default                                              | Description
 | -----------------------------------------------   | ---------------------------------------------------- | ---
-| `image.repository`                                | `docker.io/weaveworks/flux`                          | Image repository
+| `image.repository`                                | `docker.io/fluxcd/flux`                              | Image repository
 | `image.tag`                                       | `<VERSION>`                                          | Image tag
 | `replicaCount`                                    | `1`                                                  | Number of Flux pods to deploy, more than one is not desirable.
 | `image.pullPolicy`                                | `IfNotPresent`                                       | Image pull policy
@@ -251,7 +251,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 | `memcached.securityContext`                       | [See values.yaml](/chart/flux/values.yaml#L192-L195) | Container security context for memcached
 | `helmOperator.create`                             | `false`                                              | If `true`, install the Helm operator
 | `helmOperator.createCRD`                          | `true`                                               | Create the `v1beta1` and `v1alpha2` Flux CRDs. Dependent on `helmOperator.create=true`
-| `helmOperator.repository`                         | `docker.io/weaveworks/helm-operator`                 | Helm operator image repository
+| `helmOperator.repository`                         | `docker.io/fluxcd/helm-operator`                     | Helm operator image repository
 | `helmOperator.tag`                                | `<VERSION>`                                          | Helm operator image tag
 | `helmOperator.replicaCount`                       | `1`                                                  | Number of helm operator pods to deploy, more than one is not desirable.
 | `helmOperator.pullPolicy`                         | `IfNotPresent`                                       | Helm operator image pull policy
diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index 737c2d2d2..03ec725dc 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.annotations }}
       {{- .Values.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/chart/flux/templates/helm-operator-deployment.yaml b/chart/flux/templates/helm-operator-deployment.yaml
index 8308635eb..fc036ecf2 100644
--- a/chart/flux/templates/helm-operator-deployment.yaml
+++ b/chart/flux/templates/helm-operator-deployment.yaml
@@ -20,7 +20,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.helmOperator.annotations }}
       {{- .Values.helmOperator.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index a87313cd8..823d9772a 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -8,8 +8,8 @@ replicaCount: 1
 logFormat: fmt
 
 image:
-  repository: docker.io/weaveworks/flux
-  tag: 1.13.2
+  repository: docker.io/fluxcd/flux
+  tag: 1.13.3
   pullPolicy: IfNotPresent
   pullSecret:
 
@@ -21,8 +21,8 @@ helmOperator:
   replicaCount: 1
   create: false
   createCRD: true
-  repository: docker.io/weaveworks/helm-operator
-  tag: 0.9.1
+  repository: docker.io/fluxcd/helm-operator
+  tag: 0.10.0
   pullPolicy: IfNotPresent
   pullSecret:
   # Limit the operator scope to a single namespace
diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
index edc33ebee..8d6f509ae 100644
--- a/cluster/kubernetes/policies_test.go
+++ b/cluster/kubernetes/policies_test.go
@@ -22,8 +22,8 @@ func TestUpdatePolicies(t *testing.T) {
 	}{
 		{
 			name: "adding annotation with others existing",
-			in:   []string{"prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/automated", "'true'"},
+			in:   []string{"prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/automated", "'true'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -38,8 +38,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "adding annotation when already has annotation and others",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -54,8 +54,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "add and remove different annotations at the same time",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/locked", "'true'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/locked", "'true'"},
 			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Automated: "true"},
@@ -72,8 +72,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with others existing",
-			in:   []string{"flux.weave.works/automated", "true", "prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"flux.weave.works/automated", "true", "prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
@@ -96,8 +96,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with only others",
-			in:   []string{"prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
diff --git a/cluster/kubernetes/update_test.go b/cluster/kubernetes/update_test.go
index ea2ed46e8..f5ae8c8c9 100644
--- a/cluster/kubernetes/update_test.go
+++ b/cluster/kubernetes/update_test.go
@@ -471,7 +471,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
@@ -522,7 +522,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 481886993..25f3a509f 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -287,7 +287,7 @@ func main() {
 	possiblyRequired := stringset(RequireValues)
 	for _, r := range *registryRequire {
 		if !possiblyRequired.has(r) {
-			logger.Log("err", fmt.Sprintf("--registry-required value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
+			logger.Log("err", fmt.Sprintf("--registry-require value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
 			os.Exit(1)
 		}
 	}
@@ -449,7 +449,7 @@ func main() {
 		awsPreflight, credsWithAWSAuth := registry.ImageCredsWithAWSAuth(imageCreds, log.With(logger, "component", "aws"), awsConf)
 		if mandatoryRegistry.has(RequireECR) {
 			if err := awsPreflight(); err != nil {
-				logger.Log("error", "AWS API required (due to --registry-required=ecr), but not available", "err", err)
+				logger.Log("error", "AWS API required (due to --registry-require=ecr), but not available", "err", err)
 				os.Exit(1)
 			}
 		}
diff --git a/deploy-helm/helm-operator-deployment.yaml b/deploy-helm/helm-operator-deployment.yaml
index 317e55f10..e41941153 100644
--- a/deploy-helm/helm-operator-deployment.yaml
+++ b/deploy-helm/helm-operator-deployment.yaml
@@ -62,7 +62,7 @@ spec:
         # There are no ":latest" images for helm-operator. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/helm-operator:0.9.1
+        image: docker.io/fluxcd/helm-operator:0.9.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index cb62131e7..d4a779c55 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.scrape: "false"
+        prometheus.io/scrape: "false"
       labels:
         app: flux-helm-operator
     spec:
@@ -27,7 +27,7 @@ spec:
             secretName: flux-git-deploy
       containers:
         - name: flux-helm-operator
-          image: docker.io/weaveworks/helm-operator:0.9.1
+          image: docker.io/fluxcd/helm-operator:0.9.1
           imagePullPolicy: IfNotPresent
           args:
             - --git-timeout=20s
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index adbd6b2fe..2857339ee 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.port: "3031" # tell prometheus to scrape /metrics endpoint's port.
+        prometheus.io/port: "3031" # tell prometheus to scrape /metrics endpoint's port.
       labels:
         name: flux
     spec:
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/flux:1.13.2
+        image: docker.io/fluxcd/flux:1.13.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:
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" ]
 
diff --git a/image/image.go b/image/image.go
index e8e56b10e..5f9a49afb 100644
--- a/image/image.go
+++ b/image/image.go
@@ -33,7 +33,7 @@ var (
 // Examples (stringified):
 //   * alpine
 //   * library/alpine
-//   * docker.io/weaveworks/flux
+//   * docker.io/fluxcd/flux
 //   * localhost:5000/arbitrary/path/to/repo
 type Name struct {
 	Domain, Image string
@@ -107,7 +107,7 @@ func (i Name) ToRef(tag string) Ref {
 // Examples (stringified):
 //  * alpine:3.5
 //  * library/alpine:3.5
-//  * docker.io/weaveworks/flux:1.1.0
+//  * docker.io/fluxcd/flux:1.1.0
 //  * localhost:5000/arbitrary/path/to/repo:revision-sha1
 type Ref struct {
 	Name
diff --git a/registry/cache/registry.go b/registry/cache/registry.go
index d238dc5e9..89df2edc7 100644
--- a/registry/cache/registry.go
+++ b/registry/cache/registry.go
@@ -74,7 +74,7 @@ func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
 }
 
 // GetImageRepositoryMetadata returns the metadata from an image
-// repository (e.g,. at "docker.io/weaveworks/flux")
+// repository (e.g,. at "docker.io/fluxcd/flux")
 func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetadata, error) {
 	repoKey := NewRepositoryKey(id.CanonicalName())
 	bytes, _, err := c.Reader.GetKey(repoKey)
diff --git a/registry/client.go b/registry/client.go
index b34de4635..2afe6dc02 100644
--- a/registry/client.go
+++ b/registry/client.go
@@ -56,7 +56,7 @@ func (entry *ImageEntry) UnmarshalJSON(bytes []byte) error {
 }
 
 // Client is a remote registry client for a particular image
-// repository (e.g., for docker.io/weaveworks/flux). It is an interface
+// repository (e.g., for docker.io/fluxcd/flux). It is an interface
 // so we can wrap it in instrumentation, write fake implementations,
 // and so on.
 type Client interface {
diff --git a/registry/credentials.go b/registry/credentials.go
index 9962b8903..ed9e53419 100644
--- a/registry/credentials.go
+++ b/registry/credentials.go
@@ -74,28 +74,29 @@ func ParseCredentials(from string, b []byte) (Credentials, error) {
 			return Credentials{}, err
 		}
 
+		if host == "http://" || host == "https://" {
+			return Credentials{}, errors.New("Empty registry auth url")
+		}
+
 		// Some users were passing in credentials in the form of
 		// http://docker.io and http://docker.io/v1/, etc.
 		// So strip everything down to the host.
 		// Also, the registry might be local and on a different port.
 		// So we need to check for that because url.Parse won't parse the ip:port format very well.
 		u, err := url.Parse(host)
-		if err != nil {
-			return Credentials{}, err
-		}
-		if u.Host == "" && u.Path == "" && !strings.Contains(host, ":") || host == "http://" || host == "https://" {
-			return Credentials{}, errors.New("Empty registry auth url")
-		}
-		if u.Host == "" { // If there's no https:// prefix, it won't parse the host.
+
+		// if anything went wrong try to prepend https://
+		if err != nil || u.Host == "" {
 			u, err = url.Parse(fmt.Sprintf("https://%s/", host))
 			if err != nil {
 				return Credentials{}, err
 			}
-			// If the host is still empty, then there's probably a rogue /
-			if u.Host == "" {
-				return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
-			}
 		}
+
+		if u.Host == "" { // If host is still empty the url must be broken.
+			return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
+		}
+
 		host = u.Host
 
 		creds.registry = host
diff --git a/registry/credentials_test.go b/registry/credentials_test.go
index b93c8f282..d8473f607 100644
--- a/registry/credentials_test.go
+++ b/registry/credentials_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -39,6 +38,10 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			host:        "localhost:5000/v2/",
 			imagePrefix: "localhost:5000",
 		},
+		{
+			host:        "192.168.99.100:5000",
+			imagePrefix: "192.168.99.100:5000",
+		},
 		{
 			host:        "https://192.168.99.100:5000/v2",
 			imagePrefix: "192.168.99.100:5000",
@@ -84,19 +87,20 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			error: true,
 		},
 	} {
-		stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
-		creds, err := ParseCredentials("test", []byte(stringCreds))
-		time.Sleep(100 * time.Millisecond)
-		if (err != nil) != v.error {
-			t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
-		}
-		if v.error {
-			continue
-		}
-		actualUser := creds.credsFor(v.imagePrefix).username
-		assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
-		actualPass := creds.credsFor(v.imagePrefix).password
-		assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		t.Run(v.host, func(t *testing.T) {
+			stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
+			creds, err := ParseCredentials("test", []byte(stringCreds))
+			if (err != nil) != v.error {
+				t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
+			}
+			if v.error {
+				return
+			}
+			actualUser := creds.credsFor(v.imagePrefix).username
+			assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
+			actualPass := creds.credsFor(v.imagePrefix).password
+			assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		})
 	}
 }
 
diff --git a/registry/imageentry_test.go b/registry/imageentry_test.go
index 6263f1234..0789745f8 100644
--- a/registry/imageentry_test.go
+++ b/registry/imageentry_test.go
@@ -22,7 +22,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 		assert.Equal(t, entry, entry2)
 	}
 
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 
 	info := image.Info{
@@ -44,7 +44,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 // Check that existing entries, which are image.Info, will parse into
 // the ImageEntry struct.
 func TestImageInfoParsesAsEntry(t *testing.T) {
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 	info := image.Info{
 		ID:        ref,
diff --git a/site/fluxyaml-config-files.md b/site/fluxyaml-config-files.md
index c836730d4..0587f87d2 100644
--- a/site/fluxyaml-config-files.md
+++ b/site/fluxyaml-config-files.md
@@ -144,8 +144,8 @@ in your own Flux-based image or, if the tools are popular enough, Flux maintaine
 (please create an issue). In the future (once [Ephemeral containers](https://github.com/kubernetes/kubernetes/pull/59416)
 are available), you will be able to specify an container image for each command.
 
-The working directory (also known as CWD) of the `command`s executed from a `.fluxctl.yaml` file will be set to the
-target path (`--git-path` entry) used when finding that `.fluxctl.yaml` file.
+The working directory (also known as CWD) of the `command`s executed from a `.flux.yaml` file will be set to the
+target path (`--git-path` entry) used when finding that `.flux.yaml` file.
 
 For example, when using flux with `--git-path=staging` on a git repository with this structure:
 
diff --git a/site/get-started-developing.md b/site/get-started-developing.md
index 93d7a7648..2e3f9606e 100644
--- a/site/get-started-developing.md
+++ b/site/get-started-developing.md
@@ -7,7 +7,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
 > From a very high level, there are at least 3 ways you can develop on Flux once you have your environment set up:
 > 1. The "minimalist" approach (only requires and `kubectl`):
 >    1. `make`
->    1. copy the specific image tag (e.g. `docker.io/weaveworks/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
+>    1. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
 >    1. deploy the resources in `/develop/*.yaml` manually with `kubectl apply`
 >    1. make a change to the code
 >    1. see your code changes have been deployed
@@ -98,19 +98,19 @@ Now that we know everything is working with `flux-getting-started`, we're going
     In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo.  You'll see docker's usual output as it builds the image layers.  Once it's done, you should see something like this in the middle of the output:
     ```
     Successfully built 606610e0f4ef
-    Successfully tagged docker.io/weaveworks/flux:latest
-    Successfully tagged docker.io/weaveworks/flux:master-a86167e4
+    Successfully tagged docker.io/fluxcd/flux:latest
+    Successfully tagged docker.io/fluxcd/flux:master-a86167e4
     ```
     This confirms that a new docker image was tagged for your image.
 
-1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
+1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/fluxcd/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
     ```yaml
     spec:
       template:
         spec:
           containers:
           - name: flux
-            image: docker.io/weaveworks/flux
+            image: docker.io/fluxcd/flux
             imagePullPolicy: IfNotPresent
             args:
               - --git-url=git@github.com:<YOUR-GITHUB-USERNAME>/flux-getting-started
@@ -157,8 +157,8 @@ Now that we know everything is working with `flux-getting-started`, we're going
 
     You should see an output that looks something like this:
     ```
-    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
-    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux    successful=60 attempted=60
+    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
+    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux    successful=60 attempted=60
     ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
     ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
     ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
@@ -186,9 +186,9 @@ Now that we know everything is working with `flux-getting-started`, we're going
     flux-6f7fd5bbc-6j9d5   1/1     Running   0          10s
     ```
 
-    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/weaveworks/flux:latest` and it went ahead and redeployed that pod for us.
+    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/fluxcd/flux:latest` and it went ahead and redeployed that pod for us.
 
-    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/weaveworks/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
+    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
 
     There is another way to do this, of course.  Remember that before when we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>` syntax (in our specific example above it was `:master-a86167e4`).  We could, in theory, grab that tag every time we `make`, and then paste it into `spec.template.spec.containers[0].image` of our deployment.  That's tedious and error prone.  Instead, `freshpod` cuts this step out for us and accomplishes the same end goal.
 
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 12b38daf0..ac6057dec 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -111,7 +111,7 @@ happen:
    ```yaml
     spec:
       containers:
-        image: docker.io/weaveworks/flux
+        image: docker.io/fluxcd/flux
         ...
         volumeMounts:
         - name: acr-credentials
diff --git a/site/upgrading-to-1.0.md b/site/upgrading-to-1.0.md
index 20f8d34dd..4f3c0198f 100644
--- a/site/upgrading-to-1.0.md
+++ b/site/upgrading-to-1.0.md
@@ -266,11 +266,4 @@ and if there are manifests for the old Flux still in git, it will
 create those as resources.
 
 If that’s the case, you will need to remove the manifests from git
-before running Flux v1. You can download manifests from Weave Cloud,
-or adapt those given in the repo, if you want to check them back in.
-
-### Something else went wrong
-
-You can reach Weaveworks developers in our community Slack --
-https://weaveworks.github.io/community-slack/ -- where we will be able
-to help.
+before running Flux v1.