diff --git a/build/Makefile b/build/Makefile
index c697b81977..9dab2fb26b 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -916,10 +916,10 @@ setup-grafana: PVC ?= true
 setup-grafana: PV_SIZE ?= 64Gi
 setup-grafana: PASSWORD ?= admin
 setup-grafana:
-	$(DOCKER_RUN) helm repo add grafana https://grafana.github.io/helm-charts
+	$(DOCKER_RUN) helm repo add grafana-community https://grafana-community.github.io/helm-charts
 	$(DOCKER_RUN) helm repo update
 	$(DOCKER_RUN) kubectl apply -f $(mount_path)/build/grafana/
-	$(DOCKER_RUN) helm upgrade grafana grafana/grafana --install --wait \
+	$(DOCKER_RUN) helm upgrade grafana grafana-community/grafana --install --wait \
 		--namespace metrics --create-namespace \
 		--set persistence.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \
 		--set adminPassword=$(PASSWORD) $(HELM_ARGS) -f $(mount_path)/build/grafana.yaml
diff --git a/build/docs/make-reference.md b/build/docs/make-reference.md
index d9d4458e8b..54e7a6f72e 100644
--- a/build/docs/make-reference.md
+++ b/build/docs/make-reference.md
@@ -193,7 +193,7 @@ Run helm repo update to get the mose recent charts.
 
 #### `make setup-grafana`
 
-Install Grafana server using [grafana community](https://grafana.github.io/helm-charts) chart into
+Install Grafana server using [grafana community](https://grafana-community.github.io/helm-charts) chart into
 the current cluster and setup [Agones dashboards with Prometheus datasource](./grafana/).
 
 You can set your own password using the `PASSWORD` environment variable.
diff --git a/site/content/en/docs/Guides/metrics.md b/site/content/en/docs/Guides/metrics.md
index c2564b5f67..9fa80fb604 100644
--- a/site/content/en/docs/Guides/metrics.md
+++ b/site/content/en/docs/Guides/metrics.md
@@ -191,14 +191,14 @@ kubectl apply -f ./build/grafana/
 ```
 
 Now we can install the
-[Grafana Community Kubernetes Helm Charts](https://grafana.github.io/helm-charts/) from
+[Grafana Community Kubernetes Helm Charts](https://grafana-community.github.io/helm-charts/) from
 their repository. (Replace `<your-admin-password>` with the admin password of your choice)
 
 ```bash
-helm repo add grafana https://grafana.github.io/helm-charts
+helm repo add grafana-community https://grafana-community.github.io/helm-charts
 helm repo update
 
-helm upgrade --install --wait grafana grafana/grafana --namespace metrics \
+helm upgrade --install --wait grafana grafana-community/grafana --namespace metrics \
   --set adminPassword=<your-admin-password> -f ./build/grafana.yaml
 ```