diff --git a/etc/lxc.config.in b/etc/lxc.config.in
index 8879f43..1a17675 100644
--- a/etc/lxc.config.in
+++ b/etc/lxc.config.in
@@ -22,6 +22,7 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 # mounts points
 lxc.mount.entry=proc ROOTFS/proc proc nodev,noexec,nosuid 0 0
 lxc.mount.entry=sysfs ROOTFS/sys sysfs defaults  0 0
+lxc.mount.entry=shm dev/shm tmpfs rw,nodev,noexec,nosuid,relatime,mode=1777,create=dir 0 0
 
 # Container with network virtualized using a pre-configured bridge named br0 and
 # veth pair virtual network devices
diff --git a/target-bin/bootstrap-fixup.in b/target-bin/bootstrap-fixup.in
index 222b368..5c04c1f 100755
--- a/target-bin/bootstrap-fixup.in
+++ b/target-bin/bootstrap-fixup.in
@@ -22,7 +22,7 @@ fi
 echo '127.0.1.1 gitian' >> /etc/hosts
 
 # If LXC
-if grep /lxc/gitian /proc/1/cgroup > /dev/null; then
+if grep /lxc/gitian /proc/1/cgroup > /dev/null || grep container=lxc /proc/1/environ > /dev/null; then
   adduser --disabled-password --gecos ${DISTRIB_NAME,,} --quiet ${DISTRIB_NAME,,} || true
   apt-get remove -y rsyslog || true
   dpkg-divert --local --rename --add /sbin/initctl