diff --git a/debian/changelog b/debian/changelog
index 059329a4..87fdffe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.360) xenial; urgency=medium
+
+  [ Michael Vogt ]
+  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
+    - add default ubuntu user to "adm" and "sudo" groups
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Fix the previous apt list removal hook. This hook needs to
+    be .binary as otherwise we're still left with apt lists when
+    the image is published.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Dec 2015 11:03:35 +0100
+
 livecd-rootfs (2.359) xenial; urgency=medium
 
   * ubuntu-cpc:
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
index e9f3e2b1..04586c58 100755
--- a/live-build/ubuntu-core/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -6,7 +6,7 @@ USER=ubuntu
 UGID=1000
 
 echo "I: creating default user $USER"
-adduser --gecos $USER --disabled-login $USER --uid $UGID
+adduser --ingroup adm --ingroup sudo --gecos $USER --disabled-login $USER --uid $UGID
 
 chown -R $UGID:$UGID /home/$USER
 
diff --git a/live-build/ubuntu-touch/hooks/99-remove-lists.chroot b/live-build/ubuntu-touch/hooks/99-remove-lists.binary
similarity index 59%
rename from live-build/ubuntu-touch/hooks/99-remove-lists.chroot
rename to live-build/ubuntu-touch/hooks/99-remove-lists.binary
index 4b621242..37f3295f 100755
--- a/live-build/ubuntu-touch/hooks/99-remove-lists.chroot
+++ b/live-build/ubuntu-touch/hooks/99-remove-lists.binary
@@ -5,5 +5,5 @@
 # Author: Łukasz 'sil2100' Zemczak <achiang@canonical.com>
 # Date  : September 22, 2015
 
-echo "Removing /var/lib/apt/lists/*"
-find /var/lib/apt/lists/ -type f | xargs rm -f
+echo "Removing /var/lib/apt/lists/* from the binary"
+find binary/boot/filesystem.dir/var/lib/apt/lists/ -type f | xargs rm -f
\ No newline at end of file