diff --git a/hieradata/roles/infra/sql/galera.yaml b/hieradata/roles/infra/sql/galera.yaml
index 64df7d9..084072a 100644
--- a/hieradata/roles/infra/sql/galera.yaml
+++ b/hieradata/roles/infra/sql/galera.yaml
@@ -8,8 +8,8 @@ profiles::sql::galera_member::innodb_file_per_table: 1
 profiles::sql::galera_member::package_name: mariadb-galera-server
 
 consul::services:
-  puppet:
-    service_name: "mariadb-%{lookup('profiles::sql::galera_member::cluster_name')}"
+  mariadb:
+    service_name: "mariadb-%{facts.environment}"
     tags:
       - 'database'
       - 'mariadb'
@@ -23,5 +23,5 @@ consul::services:
         timeout: '1s'
 profiles::consul::client::node_rules:
   - resource: service
-    segment: "mariadb-%{lookup('profiles::sql::galera_member::cluster_name')}"
+    segment: "mariadb-%{facts.environment}"
     disposition: write
diff --git a/hieradata/roles/infra/storage/edgecache.yaml b/hieradata/roles/infra/storage/edgecache.yaml
index af26945..67e6b28 100644
--- a/hieradata/roles/infra/storage/edgecache.yaml
+++ b/hieradata/roles/infra/storage/edgecache.yaml
@@ -1,6 +1,6 @@
 ---
 consul::services:
-  puppet:
+  edgecache:
     service_name: 'edgecache'
     tags:
       - 'cache'