diff --git a/gitdm.config b/gitdm.config
index f20e553..9e4ab17 100644
--- a/gitdm.config
+++ b/gitdm.config
@@ -24,6 +24,7 @@ EmailMap openstack-config/email-map
 GroupMap openstack-config/groups/att AT&T
 GroupMap openstack-config/groups/bvox BVox
 GroupMap openstack-config/groups/canonical Canonical
+GroupMap openstack-config/groups/cloudbase Cloudbase Solutions
 GroupMap openstack-config/groups/delta Delta Electronics
 GroupMap openstack-config/groups/dreamhost DreamHost
 GroupMap openstack-config/groups/everbread Everbread
@@ -31,7 +32,6 @@ GroupMap openstack-config/groups/ibm IBM
 GroupMap openstack-config/groups/internap Internap
 GroupMap openstack-config/groups/intel Intel
 GroupMap openstack-config/groups/locaweb Locaweb
-GroupMap openstack-config/groups/microsoft Microsoft
 GroupMap openstack-config/groups/midokura Midokura
 GroupMap openstack-config/groups/mirantis Mirantis
 GroupMap openstack-config/groups/nebula Nebula
diff --git a/openstack-config/groups/microsoft b/openstack-config/groups/cloudbase
similarity index 100%
rename from openstack-config/groups/microsoft
rename to openstack-config/groups/cloudbase