diff --git a/inventory/group_vars/qadevel-stg b/inventory/group_vars/qa-stg
similarity index 95%
rename from inventory/group_vars/qadevel-stg
rename to inventory/group_vars/qa-stg
index 83107ae046..bb36f1b96d 100644
--- a/inventory/group_vars/qadevel-stg
+++ b/inventory/group_vars/qa-stg
@@ -20,10 +20,10 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
                  --network=bridge=br0,model=virtio --autostart --noautoconsole
 
 sshd_config: ssh/sshd_config.qadevel
-external_hostname: qadevel.stg.fedoraproject.org
+external_hostname: qa.stg.fedoraproject.org
 
-sslcertfile: qadevel-stg.qa.fedoraproject.org.cert
-sslkeyfile: qadevel-stg.qa.fedoraproject.org.key
+sslcertfile: qa-stg01.qa.fedoraproject.org.cert
+sslkeyfile: qa-stg01.qa.fedoraproject.org.key
 
 mariadb_host: localhost
 mariadb_config: my.cnf.phabricator
diff --git a/inventory/host_vars/qadevel-stg.qa.fedoraproject.org b/inventory/host_vars/qa-stg01.qa.fedoraproject.org
similarity index 86%
rename from inventory/host_vars/qadevel-stg.qa.fedoraproject.org
rename to inventory/host_vars/qa-stg01.qa.fedoraproject.org
index faecd02854..dad0a4136d 100644
--- a/inventory/host_vars/qadevel-stg.qa.fedoraproject.org
+++ b/inventory/host_vars/qa-stg01.qa.fedoraproject.org
@@ -13,8 +13,8 @@ fas_client_groups: sysadmin-qa,sysadmin-main
 
 mariadb_root_password: "{{ qadevel_stg_mariadb_root_password }}"
 
-public_hostname: qadevel.stg.qa.fedoraproject.org
+public_hostname: qa.stg.fedoraproject.org
 buildmaster: 10.5.124.230
 
 buildslaves:
-    - qadevel-stg
+    - qa-stg
diff --git a/inventory/inventory b/inventory/inventory
index 15b08dafbc..cbd2eeeb8f 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -17,8 +17,8 @@ qa08.qa.fedoraproject.org
 [qadevel]
 qadevel.qa.fedoraproject.org:222
 
-[qadevel-stg]
-qadevel-stg.qa.fedoraproject.org:222
+[qa-stg]
+qa-stg01.qa.fedoraproject.org:222
 
 [arm-packager]
 arm03-packager00.cloud.fedoraproject.org
diff --git a/playbooks/groups/qadevel-stg.yml b/playbooks/groups/qa-stg.yml
similarity index 100%
rename from playbooks/groups/qadevel-stg.yml
rename to playbooks/groups/qa-stg.yml