diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index d8b9e1b..142f7b3 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -74,3 +74,6 @@ rutops_ssh_keys:
     - 'rila'
     - 'thorslund'
     - 'acrn'
+
+cosmos_fleetlock_config:
+  fleetlock_group: 'rut-prod'
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index a66ec44..4f4797b 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -33,8 +33,7 @@
         port: '30443'
   sunet::otel::alloy:
     otel_receiver: monitor-prod.rut.sunet.se
-  cosmos_fleetlock_config:
-    fleetlock_group: rut-prod
+  sunet::fleetlock_client:
 
 '^internal-sto4-prod-k8sw-[0-9].rut.sunet.se$':
   rut::infra_ca_rp: