diff --git a/cosmopda.yaml b/cosmopda.yaml
index 86c555f..04ae36d 100644
--- a/cosmopda.yaml
+++ b/cosmopda.yaml
@@ -1,4 +1,4 @@
-{{- $image := or .image "gemian-cosmopda.tgz" -}}
+{{- $image := or .image "gemian-cosmocom.tgz" -}}
 {{- $output := or .output "tarball" -}}
 {{- $variant := or .variant "mate" -}}
 
@@ -20,7 +20,11 @@ actions:
 
   - action: apt
     description: Installing Cosmo Communicator-specific packages
-    packages: [ bluebinder ]
+    target-device: mt6771
+    packages:
+      - bluebinder
+      - gemian-system
+      - lxc-android
 
   - action: run
     description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator
diff --git a/gemian-common.yaml b/gemian-common.yaml
index 5214cab..08aa4b8 100644
--- a/gemian-common.yaml
+++ b/gemian-common.yaml
@@ -15,7 +15,7 @@ actions:
 
   - action: apt
     description: Installing additional Debian packages
-    packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon ]
+    packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon, locales, bash-completion ]
 
   - action: run
     chroot: true
@@ -43,10 +43,6 @@ actions:
       - xkb-data
       - xserver-xorg-video-hwcomposer
       - xss-lock
-      - bash-completion
-      - gemian-system
-      - lxc-android
-      - locales
 
   - action: run
     chroot: true
diff --git a/geminipda.yaml b/geminipda.yaml
index 4fdcf3f..bbbd045 100644
--- a/geminipda.yaml
+++ b/geminipda.yaml
@@ -14,7 +14,13 @@ actions:
 
   - action: apt
     description: Installing Gemini PDA-specific packages
-    packages: [ droid-hal-cosmopda initramfs-tools-halium gemian-modular-kernel ]
+    target-device: mt6797
+    packages:
+      - droid-hal-cosmopda
+      - initramfs-tools-halium
+      - gemian-modular-kernel
+      - gemian-system
+      - lxc-android
 
   - action: run
     chroot: true