diff --git a/bootstrap/00-kernel b/bootstrap/00-kernel
index 95b8ed1..4504df3 100755
--- a/bootstrap/00-kernel
+++ b/bootstrap/00-kernel
@@ -36,10 +36,3 @@ cat <<EOF > /etc/fstab
 /dev/mmcblk0p1  /boot           vfat    defaults          0       2
 /dev/mmcblk0p2  /               ext4    defaults,noatime  0       1
 EOF
-
-cat <<EOF >> /etc/sysctl.conf
-vm.vfs_cache_pressure=500
-vm.swappiness=100
-vm.dirty_background_ratio=1
-vm.dirty_ratio=50
-EOF
diff --git a/bootstrap/01-system b/bootstrap/01-system
index 99c5d42..4a14171 100755
--- a/bootstrap/01-system
+++ b/bootstrap/01-system
@@ -3,21 +3,16 @@
 set -xe
 
 TARGET_HOSTNAME="raspberrypi"
-TARGET_TIMEZONE="Europe/Madrid"
+#TARGET_TIMEZONE="Europe/Zurich"
 ROOT_PASS=raspberry
 
 # base stuff
-apk add ca-certificates
+apk add curl ca-certificates
 update-ca-certificates
 echo "root:$ROOT_PASS" | chpasswd
 setup-hostname $TARGET_HOSTNAME
 echo "127.0.0.1    $TARGET_HOSTNAME $TARGET_HOSTNAME.localdomain" > /etc/hosts
-setup-keymap es es
 
 # time
-apk add chrony tzdata
-setup-timezone -z $TARGET_TIMEZONE
-
-# other stuff
-apk add nano htop curl wget bash bash-completion findutils
-sed -i 's/\/bin\/ash/\/bin\/bash/g' /etc/passwd
+#apk add chrony tzdata
+#setup-timezone -z $TARGET_TIMEZONE
diff --git a/bootstrap/02-users b/bootstrap/02-users
index 73c9527..e1190ca 100755
--- a/bootstrap/02-users
+++ b/bootstrap/02-users
@@ -5,17 +5,10 @@ set -xe
 FIRST_USER_NAME=pi
 FIRST_USER_PASS=raspberry
 
-apk add sudo
-
-for GRP in spi i2c gpio; do
-	addgroup --system $GRP
-done
-
 adduser -s /bin/ash -D $FIRST_USER_NAME
 
-for GRP in adm dialout cdrom audio users video games input tty gpio spi i2c netdev; do
+for GRP in adm dialout cdrom audio users video games input tty netdev; do
   adduser $FIRST_USER_NAME $GRP
 done
 
-echo "$FIRST_USER_NAME:$FIRST_USER_PASS" | /usr/sbin/chpasswd
-echo "$FIRST_USER_NAME ALL=NOPASSWD: ALL" >> /etc/sudoers
+echo "$FIRST_USER_NAME:$FIRST_USER_PASS" | chpasswd
diff --git a/bootstrap/03-networking b/bootstrap/03-networking
index c27db4d..d5ae6f8 100755
--- a/bootstrap/03-networking
+++ b/bootstrap/03-networking
@@ -2,7 +2,7 @@
 
 set -xe
 
-apk add wpa_supplicant wireless-tools wireless-regdb iw
+apk add wpa_supplicant wireless-tools wireless-regdb iw dbus
 sed -i 's/wpa_supplicant_args=\"/wpa_supplicant_args=\" -u -Dwext,nl80211/' /etc/conf.d/wpa_supplicant
 
 echo -e 'brcmfmac' >> /etc/modules
@@ -30,9 +30,3 @@ iface wlan0 inet dhcp
 hostname raspberrypi  
 EOF
 
-# avahi
-apk add dbus avahi
-
-# bluetooth
-apk add bluez bluez-deprecated
-sed -i '/bcm43xx/s/^#//' /etc/mdev.conf
diff --git a/bootstrap/04-services b/bootstrap/04-services
index e23f1e7..1c7cc6b 100755
--- a/bootstrap/04-services
+++ b/bootstrap/04-services
@@ -12,7 +12,7 @@ for service in modules sysctl hostname bootmisc swclock syslog swap; do
 	rc-update add $service boot
 done
 
-for service in dbus haveged sshd chronyd local networking avahi-daemon bluetooth wpa_supplicant wpa_cli; do
+for service in dbus haveged sshd local networking wpa_supplicant wpa_cli; do
 	rc-update add $service default
 done
 
diff --git a/bootstrap/99-first-boot b/bootstrap/99-first-boot
index 880e9f2..ba60045 100755
--- a/bootstrap/99-first-boot
+++ b/bootstrap/99-first-boot
@@ -8,7 +8,7 @@ cat <<EOF > /usr/bin/first-boot
 #!/bin/sh
 set -xe
 
-cat <<PARTED | sudo parted ---pretend-input-tty /dev/mmcblk0
+cat <<PARTED | parted ---pretend-input-tty /dev/mmcblk0
 unit %
 resizepart 2
 Yes
@@ -35,3 +35,30 @@ EOF
 
 chmod +x /etc/init.d/first-boot /usr/bin/first-boot
 rc-update add first-boot
+
+cat <<EOF > /usr/bin/second-boot
+#!/bin/sh
+set -xe
+
+if [ -f /boot/second-boot.sh ]; then
+  /bin/sh /boot/second-boot.sh
+fi
+
+rc-update del second-boot
+rm /etc/init.d/second-boot /usr/bin/second-boot
+
+reboot
+EOF
+
+cat <<EOF > /etc/init.d/second-boot
+#!/sbin/openrc-run
+command="/usr/bin/second-boot"
+command_background=false
+depend() {
+  after local
+  need localmount net
+}
+EOF
+
+chmod +x /etc/init.d/second-boot /usr/bin/second-boot
+rc-update add second-boot default