diff --git a/images/child-device-systemd/child.dockerfile b/images/child-device-systemd/child.dockerfile
index 29b20fb..abdaf75 100644
--- a/images/child-device-systemd/child.dockerfile
+++ b/images/child-device-systemd/child.dockerfile
@@ -48,7 +48,8 @@ COPY child-device-systemd/config/sshd_config /etc/ssh/sshd_config
 
 # Optional installations
 COPY common/optional-installer.sh .
-RUN ./optional-installer.sh
+RUN ./optional-installer.sh \
+    && rm optional-installer.sh
 
 # Device bootstrap (to run one-off commands on first boot)
 COPY common/utils/configure-device/runner.sh /usr/share/configure-device/
diff --git a/images/debian-systemd/debian-systemd.dockerfile b/images/debian-systemd/debian-systemd.dockerfile
index 9876f35..427600e 100644
--- a/images/debian-systemd/debian-systemd.dockerfile
+++ b/images/debian-systemd/debian-systemd.dockerfile
@@ -44,7 +44,7 @@ RUN rm -f /lib/systemd/system/multi-user.target.wants/* \
     && chmod +x /usr/sbin/policy-rc.d
 
 # Install base files to help with bootstrapping and common settings
-WORKDIR /setup
+WORKDIR /root
 COPY common/bootstrap.sh /usr/bin/bootstrap.sh
 
 # mqtt-logger
@@ -77,7 +77,8 @@ COPY common/config/sshd_config /etc/ssh/sshd_config
 
 # Optional installations
 COPY common/optional-installer.sh .
-RUN ./optional-installer.sh
+RUN ./optional-installer.sh \
+    && rm optional-installer.sh
 
 # Device bootstrap (to run one-off commands on first boot)
 COPY common/utils/configure-device/runner.sh /usr/share/configure-device/