diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml
index 8dc0a7194..21bbcfcee 100644
--- a/container-images/container_image_prepare_defaults.yaml
+++ b/container-images/container_image_prepare_defaults.yaml
@@ -42,6 +42,6 @@ parameter_defaults:
       ceph_node_exporter_image: node-exporter
       ceph_node_exporter_tag: v0.17.0
 
-      ceph_grafana_namespace: quay.io/app-sre
+      ceph_grafana_namespace: quay.io/tripleo
       ceph_grafana_image: grafana
       ceph_grafana_tag: 5.2.4
diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index a791c3096..5d52440e1 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -203,7 +203,7 @@ container_images:
   image_source: prom
 - imagename: quay.io/prometheus/node-exporter:v0.17.0
   image_source: prom
-- imagename: quay.io/app-sre/grafana:5.2.4
+- imagename: quay.io/tripleo/grafana:5.2.4
   image_source: grafana
 - imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo
   image_source: kolla
diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml
index ff7b0150c..f2116ab3b 100644
--- a/container-images/tripleo_containers.yaml
+++ b/container-images/tripleo_containers.yaml
@@ -207,5 +207,5 @@ container_images:
   image_source: prom
 - imagename: quay.io/prometheus/node-exporter:v0.17.0
   image_source: prom
-- imagename: quay.io/app-sre/grafana:5.2.4
+- imagename: quay.io/tripleo/grafana:5.2.4
   image_source: grafana
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index f054484c9..ef94f244e 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -254,7 +254,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'ceph_namespace': 'quay.ceph.io/ceph-ci',
                 'ceph_image': 'daemon',
                 'ceph_tag': 'v4.0.13-stable-4.0-nautilus-centos-7-x86_64',
-                'ceph_grafana_namespace': 'quay.io/app-sre',
+                'ceph_grafana_namespace': 'quay.io/tripleo',
                 'ceph_grafana_image': 'grafana',
                 'ceph_grafana_tag': '5.2.4',
                 'ceph_prometheus_namespace': 'quay.io/prometheus',
@@ -281,7 +281,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'ceph_namespace': 'quay.ceph.io/ceph-ci',
                 'ceph_image': 'ceph-daemon',
                 'ceph_tag': 'latest',
-                'ceph_grafana_namespace': 'quay.io/app-sre',
+                'ceph_grafana_namespace': 'quay.io/tripleo',
                 'ceph_grafana_image': 'grafana',
                 'ceph_grafana_tag': '5.2.4',
                 'ceph_prometheus_namespace': 'quay.io/prometheus',
@@ -338,7 +338,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'ceph_namespace': 'quay.ceph.io/ceph-ci',
                 'ceph_image': 'ceph-daemon',
                 'ceph_tag': 'latest',
-                'ceph_grafana_namespace': 'quay.io/app-sre',
+                'ceph_grafana_namespace': 'quay.io/tripleo',
                 'ceph_grafana_image': 'grafana',
                 'ceph_grafana_tag': '5.2.4',
                 'ceph_prometheus_namespace': 'quay.io/prometheus',