diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa
index 8e280de56b..d8e9b162eb 100644
--- a/inventory/group_vars/openqa
+++ b/inventory/group_vars/openqa
@@ -34,6 +34,7 @@ checkcompose_atomic_emailto: "dusty@dustymabe.com walters@verbum.org atomic@list
 checkcompose_atomic_emailerror: "true"
 checkcompose_smtp: bastion.phx2.fedoraproject.org
 checkcompose_url: "https://{{ external_hostname }}"
+checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.fedoraproject.org
 
 deployment_type: prod
 freezes: false
diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg
index 65038837c6..457f57478a 100644
--- a/inventory/group_vars/openqa-stg
+++ b/inventory/group_vars/openqa-stg
@@ -41,6 +41,7 @@ wikitcms_password: "{{ stg_wikitcms_password }}"
 wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json"
 
 checkcompose_url: "https://{{ external_hostname }}"
+checkcompose_greenwaveurl: https://greenwave-web-greenwave.app.os.stg.fedoraproject.org
 
 deployment_type: stg
 freezes: false
diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index 99b5d66657..c3ae9f597b 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -31,7 +31,9 @@
 # NOTE: this is missing /etc/openqa/client.conf configuration, for now;
 # we're assuming it'll be deployed on the openqa server boxes and hence
 # client.conf will be in place (and localhost default would be correct
-# anyhow)
+# anyhow). We also get lazy and assume fedora_openqa will be installed
+# by openqa/dispatcher role; ideally we should factor this out into a
+# shared task or something.
 
 #- name: Install required packages (testing)
 #  dnf: name={{ item }} state=present enablerepo="updates-testing"
diff --git a/roles/check-compose/templates/check-compose.conf.j2 b/roles/check-compose/templates/check-compose.conf.j2
index fceb4a44ce..4d480416d8 100644
--- a/roles/check-compose/templates/check-compose.conf.j2
+++ b/roles/check-compose/templates/check-compose.conf.j2
@@ -5,6 +5,9 @@ server: {{ checkcompose_server }}
 {% if checkcompose_url is defined %}
 url: {{ checkcompose_url }}
 {% endif %}
+{% if checkcompose_greenwaveurl is defined %}
+greenwave-url: {{ checkcompose_greenwaveurl }}
+{% endif %}
 {% if checkcompose_wait is defined %}
 wait: {{ checkcompose_wait }}
 {% endif %}