diff --git a/cosmopda.yaml b/cosmocom.yaml
similarity index 85%
rename from cosmopda.yaml
rename to cosmocom.yaml
index 460786f..109f470 100644
--- a/cosmopda.yaml
+++ b/cosmocom.yaml
@@ -11,7 +11,7 @@ actions:
 
   - action: overlay
     description: Adding Cosmo Communicator overlay
-    source: overlay/cosmopda
+    source: overlay/cosmocom
     destination: /
 
   - action: apt
@@ -23,9 +23,9 @@ actions:
     target-device: mt6771
     packages:
       - bluebinder
-      - media-hub
-      - gemian-system
-      - lxc-android
+#      - media-hub
+#      - gemian-system
+#      - lxc-android
       - lxcfs
       - uidmap
       - cosmo-linux-kernel
@@ -54,23 +54,23 @@ actions:
     command: depmod -a 4.4.146
 
 {{ if eq $variant "lxqt" }}
-  - action: recipe
-    recipe: variants/lxqt.yaml
+#  - action: recipe
+#    recipe: variants/lxqt.yaml
 {{ end }}
 
 {{ if eq $variant "mate" }}
-  - action: apt
-    description: Installing MATE desktop environment
-    packages:
-      - lxdm
-      - mate-desktop-environment
-      - xserver-xorg
-      - xserver-xorg-input-evdev
+#  - action: apt
+#    description: Installing MATE desktop environment
+#    packages:
+#      - lxdm
+#      - mate-desktop-environment
+#      - xserver-xorg
+#      - xserver-xorg-input-evdev
 {{ end }}
 
 {{ if eq $variant "kde-plasma" }}
-  - action: recipe
-    recipe: variants/kde-plasma.yaml
+#  - action: recipe
+#    recipe: variants/kde-plasma.yaml
 {{ end }}
 
   - action: run
diff --git a/gemian-common.yaml b/gemian-common.yaml
index e6b0baa..7374b63 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -2,7 +2,7 @@ architecture: arm64
 
 actions:
   - action: debootstrap
-    suite: "buster"
+    suite: "bullseye"
     components:
       - main
       - non-free
@@ -26,13 +26,13 @@ actions:
     description: Installing packages for libhybris-based HW adaptation
     packages:
       - audiosystem-passthrough
-      - dialer-app
+#      - dialer-app
       - drihybris
-      - gemian-lock
-      - glamor-hybris
+#      - gemian-lock
+#      - glamor-hybris
       - hybris-usb
       - libhybris
-      - messaging-app
+#      - messaging-app
       - ofono
       - ofono-ril-binder-plugin
       - pulseaudio
@@ -41,10 +41,10 @@ actions:
       - repowerd
       - urfkill
       - xkb-data
-      - xserver-xorg-video-hwcomposer
-      - xss-lock
-      - camera-app
-      - gemian-setup
+#      - xserver-xorg-video-hwcomposer
+#      - xss-lock
+#      - camera-app
+#      - gemian-setup
       - fonts-dejavu
       - fonts-dejavu-core
       - fonts-dejavu-extra
diff --git a/overlay/cosmocom/etc/chromium.d/use-egl.conf b/overlay/cosmocom/etc/chromium.d/use-egl.conf
new file mode 100644
index 0000000..ae08a98
--- /dev/null
+++ b/overlay/cosmocom/etc/chromium.d/use-egl.conf
@@ -0,0 +1 @@
+; export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --use-gl=egl"
diff --git a/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf b/overlay/cosmocom/etc/modules-load.d/cosmocom-connectivity.conf
similarity index 100%
rename from overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf
rename to overlay/cosmocom/etc/modules-load.d/cosmocom-connectivity.conf
diff --git a/overlay/cosmopda/etc/ofono/main.conf b/overlay/cosmocom/etc/ofono/main.conf
similarity index 100%
rename from overlay/cosmopda/etc/ofono/main.conf
rename to overlay/cosmocom/etc/ofono/main.conf
diff --git a/overlay/cosmopda/etc/ofono/ril_subscription.conf b/overlay/cosmocom/etc/ofono/ril_subscription.conf
similarity index 100%
rename from overlay/cosmopda/etc/ofono/ril_subscription.conf
rename to overlay/cosmocom/etc/ofono/ril_subscription.conf
diff --git a/overlay/cosmopda/etc/pulse/arm_droid_card_custom.pa b/overlay/cosmocom/etc/pulse/arm_droid_card_custom.pa
similarity index 100%
rename from overlay/cosmopda/etc/pulse/arm_droid_card_custom.pa
rename to overlay/cosmocom/etc/pulse/arm_droid_card_custom.pa
diff --git a/overlay/cosmopda/etc/pulse/default.pa.gemian b/overlay/cosmocom/etc/pulse/default.pa.gemian
similarity index 100%
rename from overlay/cosmopda/etc/pulse/default.pa.gemian
rename to overlay/cosmocom/etc/pulse/default.pa.gemian
diff --git a/overlay/cosmopda/etc/udev/rules.d/80-keyboard.rules b/overlay/cosmocom/etc/udev/rules.d/80-keyboard.rules
similarity index 100%
rename from overlay/cosmopda/etc/udev/rules.d/80-keyboard.rules
rename to overlay/cosmocom/etc/udev/rules.d/80-keyboard.rules
diff --git a/overlay/cosmopda/etc/chromium.d/use-egl.conf b/overlay/cosmopda/etc/chromium.d/use-egl.conf
deleted file mode 100644
index 76d42e8..0000000
--- a/overlay/cosmopda/etc/chromium.d/use-egl.conf
+++ /dev/null
@@ -1 +0,0 @@
-export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --use-gl=egl"
diff --git a/scripts/add-gemian-repos.sh b/scripts/add-gemian-repos.sh
index 6434658..32cff10 100755
--- a/scripts/add-gemian-repos.sh
+++ b/scripts/add-gemian-repos.sh
@@ -3,17 +3,11 @@
 rm -f /etc/resolv.conf
 echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
-echo "deb https://gemian.thinkglobally.org/buster/ buster main" >> /etc/apt/sources.list.d/gemian.list
-echo "deb https://gemian-planet.thinkglobally.org/buster/ buster main" >> /etc/apt/sources.list.d/gemian.list
-
-echo "" >> /etc/apt/preferences.d/gemian.pref
-echo "Package: *" >> /etc/apt/preferences.d/gemian.pref
-echo "Pin: origin gemian.thinkglobally.org" >> /etc/apt/preferences.d/gemian.pref
-echo "Pin-Priority: 1000" >> /etc/apt/preferences.d/gemian.pref
+echo "deb [trusted=yes] http://gemian-planet.thinkglobally.org/bullseye/ bullseye main" >> /etc/apt/sources.list.d/gemian.list
 
 echo "" >> /etc/apt/preferences.d/gemian.pref
 echo "Package: *" >> /etc/apt/preferences.d/gemian.pref
 echo "Pin: origin gemian-planet.thinkglobally.org" >> /etc/apt/preferences.d/gemian.pref
 echo "Pin-Priority: 2000" >> /etc/apt/preferences.d/gemian.pref
 
-curl https://gemian.thinkglobally.org/archive-key.asc | apt-key add -
+curl http://gemian.thinkglobally.org/archive-key.asc | apt-key add -