diff --git a/profiles/CB1/package.use b/profiles/CB1/package.use
index 4b302ce2..58f346b0 100644
--- a/profiles/CB1/package.use
+++ b/profiles/CB1/package.use
@@ -1,2 +1,4 @@
+# for CLD
+sys-apps/calculate-utils backup client console dbus desktop gpg install qt5 -minimal -pxe
 net-dns/bind -ldap -sdb-ldap
 net-print/hplip X
diff --git a/profiles/CB2/package.use b/profiles/CB2/package.use
index d1fd14ab..7029f118 100644
--- a/profiles/CB2/package.use
+++ b/profiles/CB2/package.use
@@ -1,5 +1,6 @@
-# for CLC
-sys-apps/calculate-utils -backup -client -console -dbus -desktop -pxe -qt5
+# for CLS
+sys-apps/calculate-utils backup console dbus desktop gpg install -client -minimal -pxe -qt5
+sys-kernel/calculate-sources -desktop -themes
 sys-apps/calculate-access server
 
 media-plugins/audacious-plugins -qt5 gtk3
diff --git a/profiles/CB2/x86/package.use b/profiles/CB2/x86/package.use
deleted file mode 100644
index 0a16a150..00000000
--- a/profiles/CB2/x86/package.use
+++ /dev/null
@@ -1 +0,0 @@
-sys-kernel/calculate-sources -desktop -themes
diff --git a/profiles/CB3/package.use b/profiles/CB3/package.use
index 252d1575..911564f5 100644
--- a/profiles/CB3/package.use
+++ b/profiles/CB3/package.use
@@ -1,4 +1,5 @@
-sys-apps/calculate-utils -backup -client -console -dbus -desktop -install -pxe -qt5
+# for CSS
+sys-apps/calculate-utils gpg install -backup -client -console -dbus -desktop -minimal -pxe -qt5
 sys-apps/calculate-access -client server
 
 # required by x11-misc/bumblebee-3.2.1
diff --git a/profiles/CBB/package.use b/profiles/CBB/package.use
index d8b9c668..cab46f75 100644
--- a/profiles/CBB/package.use
+++ b/profiles/CBB/package.use
@@ -1 +1,2 @@
-sys-apps/calculate-utils backup console desktop install qt5 -client -minimal -pxe
+# for CCS
+sys-apps/calculate-utils gpg -backup -client -console -dbus -desktop -install -minimal -pxe -qt5
diff --git a/profiles/CBS/package.use b/profiles/CBS/package.use
new file mode 100644
index 00000000..ad3474f7
--- /dev/null
+++ b/profiles/CBS/package.use
@@ -0,0 +1,2 @@
+# for CDS
+sys-apps/calculate-utils console gpg install pxe -backup -client -dbus -desktop -minimal -qt5