diff --git a/cosmopda.yaml b/cosmopda.yaml
index a4017e8..460786f 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,15 @@ actions:
 
   - action: apt
     description: Installing Cosmo Communicator-specific packages
-    packages: [ droid-hal-cosmopda ]
+    target-device: mt6771
+    packages:
+      - bluebinder
+      - media-hub
+      - gemian-system
+      - lxc-android
+      - lxcfs
+      - uidmap
+      - cosmo-linux-kernel
 
   - action: run
     description: Generate /usr/share/kernel/linux-boot.img for Cosmo Communicator
@@ -29,12 +37,11 @@ actions:
 
   - action: run
     chroot: true
-    command: echo cosmopda > /etc/hostname
+    command: echo cosmocom > /etc/hostname
 
   - action: run
     chroot: true
-    description: Setting password on root user (useful for testing, remove later)
-    command: echo root:root | chpasswd
+    command: echo "127.0.0.1	cosmocom" >> /etc/hosts
 
   - action: run
     chroot: true
@@ -76,6 +83,11 @@ actions:
     description: Removing xserver-xorg-input-libinput as it does not work with touchscreen yet
     command: apt remove xserver-xorg-input-libinput
 
+  - action: run
+    chroot: true
+    description: Removing /var/log/journal to avoid persisant journaling
+    command: rm -rf /var/log/journal/
+
 {{ if eq $output "tarball" }}
   - action: pack
     file: {{ $image }}
@@ -85,10 +97,15 @@ actions:
 {{ if eq $output "image" }}
   - action: image-file
     imagename: {{ $image }}
-    imagesize: 3221225472
+    imagesize: 6000000000
+
     fs: ext4
     fsname: "gemian"
 
+  - action: run
+    description: Allow jenkins user to access file
+    command: chown jenkins.jenkins {{ $image }}
+
   - action: filesystem-deploy
     setup-fstab: false
     setup-kernel-cmdline: false
diff --git a/gemian-common.yaml b/gemian-common.yaml
index 283d793..14d6495 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 ]
+    packages: [ curl, gnupg, net-tools, openssh-server, sudo, avahi-daemon, locales, bash-completion ]
 
   - action: run
     chroot: true
@@ -43,6 +43,7 @@ actions:
       - xkb-data
       - xserver-xorg-video-hwcomposer
       - xss-lock
+      - camera-app
 
   - action: run
     chroot: true
@@ -63,3 +64,4 @@ actions:
     chroot: true
     description: Setting Gemian users
     script: scripts/setup-user.sh
+
diff --git a/geminipda.yaml b/geminipda.yaml
index 4512c9f..0bd5f7c 100644
--- a/geminipda.yaml
+++ b/geminipda.yaml
@@ -14,7 +14,12 @@ actions:
 
   - action: apt
     description: Installing Gemini PDA-specific packages
-    packages: [ droid-hal-cosmopda gemian-system initramfs-tools-halium gemian-modular-kernel ]
+    target-device: mt6797
+    packages:
+      - initramfs-tools-halium
+      - gemian-modular-kernel
+      - gemian-system
+      - lxc-android
 
   - action: run
     chroot: true
diff --git a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf b/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf
index 51ecf35..4d1882a 100644
--- a/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf
+++ b/overlay/common/etc/X11/xorg.conf.d/20-hwcomposer.conf
@@ -1,6 +1,6 @@
 Section "Monitor"
     Identifier             "Monitor0"
-    DisplaySize            135 68    # In millimeters
+    DisplaySize            136 68    # In millimeters - see physical_height/width in kernel sources (aeon_ssd2092_fhd_dsi_solomon.c - Cosmo)
 EndSection
 
 Section "Device"
diff --git a/overlay/common/etc/adduser.conf b/overlay/common/etc/adduser.conf
index 948d2f5..a6e50db 100644
--- a/overlay/common/etc/adduser.conf
+++ b/overlay/common/etc/adduser.conf
@@ -74,7 +74,7 @@ SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
 # new users to other groups.
 # This is the list of groups that new non-system users will be added to
 # Default:
-EXTRA_GROUPS="audio video sudo aid_system aid_graphics aid_input aid_audio aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin"
+EXTRA_GROUPS="audio input video sudo dialout aid_media aid_system aid_graphics aid_input aid_radio aid_audio aid_wakelock aid_net_bt_admin aid_net_bt aid_inet aid_inet_raw aid_inet_admin"
 
 # If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS
 # option above will be default behavior for adding new, non-system users
diff --git a/overlay/common/etc/skel/.config/kscreenlockerrc b/overlay/common/etc/skel/.config/kscreenlockerrc
index c578cbc..1d78603 100644
--- a/overlay/common/etc/skel/.config/kscreenlockerrc
+++ b/overlay/common/etc/skel/.config/kscreenlockerrc
@@ -2,5 +2,5 @@
 update_info=kscreenlocker.upd:0.1-autolock
 
 [Daemon]
-Autolock=false
-LockOnResume=false
+Autolock=true
+LockOnResume=true
diff --git a/overlay/common/etc/sleep.conf.d/gemian.conf b/overlay/common/etc/sleep.conf.d/gemian.conf
new file mode 100644
index 0000000..68afdbe
--- /dev/null
+++ b/overlay/common/etc/sleep.conf.d/gemian.conf
@@ -0,0 +1,7 @@
+[Sleep]
+AllowSuspend=yes
+AllowHibernation=no
+AllowSuspendThenHibernate=no
+AllowHybridSleep=no
+SuspendMode=suspend
+SuspendState=mem freeze
diff --git a/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf b/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf
index 65a7d3a..7e7ffc7 100644
--- a/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf
+++ b/overlay/cosmopda/etc/modules-load.d/cosmocom-connectivity.conf
@@ -1,4 +1,2 @@
-wlan_drv_gen3
-bt_drv
 gps_drv
 fmradio_drv
diff --git a/scripts/add-gemian-repos.sh b/scripts/add-gemian-repos.sh
index 5bd289f..34eef82 100755
--- a/scripts/add-gemian-repos.sh
+++ b/scripts/add-gemian-repos.sh
@@ -18,4 +18,3 @@ echo "Pin: origin gemian-buster.thinkglobally.org" >> /etc/apt/preferences.d/gem
 echo "Pin-Priority: 2000" >> /etc/apt/preferences.d/gemian.pref
 
 curl https://gemian.thinkglobally.org/archive-key.asc | apt-key add -
-curl http://gemian-buster.thinkglobally.org/gemian-buster-key.asc | apt-key add -
diff --git a/scripts/setup-user.sh b/scripts/setup-user.sh
index eaf24c5..4b2da3c 100755
--- a/scripts/setup-user.sh
+++ b/scripts/setup-user.sh
@@ -219,7 +219,9 @@ groupadd --gid 9999 aid_nobody
 useradd --gid 9999 --no-create-home --home-dir /nonexistent --no-user-group --system --shell /usr/sbin/nologin --uid 9999 aid_nobody
 
 groupadd -g 100000 cosmo
-useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,aid_system,aid_graphics,aid_input,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo
+useradd -m -u 100000 -g 100000 -G audio,input,video,sudo,dialout,aid_media,aid_system,aid_graphics,aid_input,aid_radio,aid_wakelock,aid_audio,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin -s /bin/bash cosmo
 echo cosmo:cosmo | chpasswd
 
 usermod systemd-timesync -a -G aid_inet
+usermod avahi -a -G aid_inet
+sudo usermod pulse -a -G aid_media
diff --git a/variants/kde-plasma.yaml b/variants/kde-plasma.yaml
index 6ecf242..009d765 100644
--- a/variants/kde-plasma.yaml
+++ b/variants/kde-plasma.yaml
@@ -32,6 +32,12 @@ actions:
       - xserver-xorg
       - xserver-xorg-input-evdev
       - codi-app
+      - kde-spectacle
+      - bluetooth
+      - rfkill
+      - bluedevil
+      - bluez-tools
+      - pulseaudio-module-bluetooth
 
   - action: run
     chroot: true