diff --git a/Metadata/clients.xml b/Metadata/clients.xml
index 99f927a..400da8a 100755
--- a/Metadata/clients.xml
+++ b/Metadata/clients.xml
@@ -33,7 +33,7 @@
   <Client name="asterisk.adm.crans.org" profile="asterisk" pingable="Y" pingtime="1423227886.82" version="1.3.5"/>
   <Client name="tracker.adm.crans.org" profile="tracker" pingable="Y" pingtime="1423227886.82" version="1.3.5"/>
   <Client name="redisdead.adm.crans.org" profile="redisdead" pingable="Y" pingtime="1423227886.81" version="1.3.5"/>
-  <Client name="bcfg2.adm.crans.org" profile="bcfg2" pingable="Y" pingtime="1423227886.8"/>
+  <Client name="bcfg2.adm.crans.org" profile="bcfg2" pingable="Y" pingtime="1423227886.8" version="1.3.5"/>
   <Client name="kenobi.adm.crans.org" profile="kenobi" pingable="Y" pingtime="1423227886.8" version="1.3.5"/>
   <Client name="sogo.adm.crans.org" profile="sogo" pingable="Y" pingtime="1423227886.8" version="1.3.5"/>
   <Client name="dhcp.adm.crans.org" profile="dhcp" pingable="Y" pingtime="1423227886.79" version="1.3.5"/>
@@ -57,5 +57,4 @@
   <Client name="template.adm.crans.org" profile="template" pingable="N"/>
   <!-- Test -->
   <Client name="alice.adm.crans.org" profile="alice" pingable="N"/>
-  <Client name="cfengine.adm.crans.org" profile="cfengine" pingable="N" version="1.3.5"/>
 </Clients>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index fe502e8..beb4ba2 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -156,9 +156,10 @@
 
   <Group name="bcfg2"
      profile="true">
-    <Group name="bcfg2-server"/>
+    <Group name="crans-vm-jessie"/>
     <Group name="non-vlan-adherent"/>
-    <Group name="crans-vm-wheezy"/>
+    <Group name="bcfg2-server"/>
+    <Group name="generate"/>
   </Group>
 
   <Group name="nat64"
@@ -485,13 +486,6 @@
     <Group name="no-munin" />
   </Group>
 
-  <Group name="cfengine"
-     profile="true">
-    <Group name="crans-vm-jessie"/>
-    <Group name="bcfg2-server"/>
-    <Group name="no-munin"/>
-    <Group name="generate"/>
-  </Group>
   <!-- +===================+ -->
   <!-- | Version de Debian | -->
   <!-- +===================+ -->
diff --git a/Python/etc/bcfg2.conf b/Python/etc/bcfg2.conf
index a4a1ab6..b584cd1 100644
--- a/Python/etc/bcfg2.conf
+++ b/Python/etc/bcfg2.conf
@@ -31,8 +31,5 @@ if has("bcfg2-server"):
 
 @
 @[components]
-if has("bcfg2-server"):
-    @bcfg2=https://cfengine.v6.adm.crans.org:6789
-else:
-    @bcfg2=https://cfengine.v4.adm.crans.org:6789
+@bcfg2=https://bcfg2.adm.crans.org:6789
 @encoding=UTF-8