diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
index 52bfc13c7e..fec056fce2 100644
--- a/modules/openstack_project/manifests/groups.pp
+++ b/modules/openstack_project/manifests/groups.pp
@@ -66,10 +66,12 @@ class openstack_project::groups (
     site_ssl_chain_file          => $site_ssl_chain_file,
     package_repository           => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
     package_branch               => 'stable',
-    conf_cron_key                => $conf_cron_key,
-    conf_markdown_directory      => '/srv/groups-static-pages',
-    conf_ga_account              => 'UA-17511903-1',
-    conf_openid_provider         => 'https://openstackid.org',
+    conf                         => {
+      'cron_key'                        => $conf_cron_key,
+      'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
+      'googleanalytics_account'         => 'UA-17511903-1',
+      'groups_openid_provider'          => 'https://openstackid.org'
+    },
     require                      => [ Class['openstack_project::server'],
       Vcsrepo['/srv/groups-static-pages'] ],
   }
@@ -87,4 +89,4 @@ class openstack_project::groups (
     backup_server => 'ci-backup-rs-ord.openstack.org',
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/openstack_project/manifests/groups_dev.pp b/modules/openstack_project/manifests/groups_dev.pp
index 8d8d166c10..4b0d205f66 100644
--- a/modules/openstack_project/manifests/groups_dev.pp
+++ b/modules/openstack_project/manifests/groups_dev.pp
@@ -63,9 +63,11 @@ class openstack_project::groups_dev (
     site_ssl_key_file            => $site_ssl_key_file,
     package_repository           => 'http://tarballs.openstack.org/groups/drupal-updates/release-history',
     package_branch               => 'dev',
-    conf_cron_key                => $conf_cron_key,
-    conf_markdown_directory      => '/srv/groups-static-pages',
-    conf_openid_provider         => 'https://openstackid-dev.openstack.org',
+    conf                         => {
+      'cron_key'                        => $conf_cron_key,
+      'groups_feeds_markdown_directory' => '/srv/groups-static-pages',
+      'groups_openid_provider'          => 'https://openstackid.org'
+    },
     require                      => [ Class['openstack_project::server'],
       Vcsrepo['/srv/groups-static-pages'] ]
   }