diff --git a/pepscripts/06hblock-install b/pepscripts/06hblock-install
index e0dbb08..d4d37de 100644
--- a/pepscripts/06hblock-install
+++ b/pepscripts/06hblock-install
@@ -8,8 +8,9 @@
 
 # install hblock
 
-curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.2/hblock' \
+chroot /target \
+  curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.2/hblock' \
   && echo 'a7d748b69db9f94932333a5b5f0c986dd60a39fdf4fe675ad58364fea59c74b4  /tmp/hblock' | shasum -c \
-  && sudo mv /tmp/hblock /target/usr/local/bin/hblock \
-  && sudo chown 0:0 /target/usr/local/bin/hblock \
-  && sudo chmod 755 /target/usr/local/bin/hblock
+  && mv /tmp/hblock /usr/local/bin/hblock \
+  && chown 0:0 /usr/local/bin/hblock \
+  && chmod 755 /usr/local/bin/hblock
diff --git a/pepscripts/07final-cleanup b/pepscripts/07final-cleanup
index cd1bd60..28111df 100644
--- a/pepscripts/07final-cleanup
+++ b/pepscripts/07final-cleanup
@@ -8,4 +8,11 @@
 
 # Remove unwanted software
 
-apt --purge --yes autoremove quassel thunderbird mpv smtube audacious connman
+chroot /target \
+apt --purge --yes autoremove \
+    -- quassel \
+    -- thunderbird \
+    -- mpv \
+    -- smtube \
+    -- audacious \
+    -- connman \
diff --git a/pepscriptsdev/06hblock-install b/pepscriptsdev/06hblock-install
index e0dbb08..d4d37de 100644
--- a/pepscriptsdev/06hblock-install
+++ b/pepscriptsdev/06hblock-install
@@ -8,8 +8,9 @@
 
 # install hblock
 
-curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.2/hblock' \
+chroot /target \
+  curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.2/hblock' \
   && echo 'a7d748b69db9f94932333a5b5f0c986dd60a39fdf4fe675ad58364fea59c74b4  /tmp/hblock' | shasum -c \
-  && sudo mv /tmp/hblock /target/usr/local/bin/hblock \
-  && sudo chown 0:0 /target/usr/local/bin/hblock \
-  && sudo chmod 755 /target/usr/local/bin/hblock
+  && mv /tmp/hblock /usr/local/bin/hblock \
+  && chown 0:0 /usr/local/bin/hblock \
+  && chmod 755 /usr/local/bin/hblock
diff --git a/pepscriptsdev/07final-cleanup b/pepscriptsdev/07final-cleanup
index cd1bd60..28111df 100644
--- a/pepscriptsdev/07final-cleanup
+++ b/pepscriptsdev/07final-cleanup
@@ -8,4 +8,11 @@
 
 # Remove unwanted software
 
-apt --purge --yes autoremove quassel thunderbird mpv smtube audacious connman
+chroot /target \
+apt --purge --yes autoremove \
+    -- quassel \
+    -- thunderbird \
+    -- mpv \
+    -- smtube \
+    -- audacious \
+    -- connman \