diff --git a/src/datastore_mad/remotes/docker_downloader.sh b/src/datastore_mad/remotes/docker_downloader.sh
index 917a735206..9f464884f0 100755
--- a/src/datastore_mad/remotes/docker_downloader.sh
+++ b/src/datastore_mad/remotes/docker_downloader.sh
@@ -205,7 +205,8 @@ image_id=$(docker images -q one"$sid")
 #-------------------------------------------------------------------------------
 # Flatten container image
 #-------------------------------------------------------------------------------
-container_id=$(docker run -d "$image_id" /bin/true)
+# rm -f /.dockerenv to avoid external tools to autodetect as docker images
+container_id=$(docker run -d "$image_id" rm -f /.dockerenv)
 
 docker export -o "$tarball" "$container_id" > /dev/null 2>&1
 
diff --git a/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine b/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
index da0bee051e..f628a7c38e 100644
--- a/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
+++ b/src/datastore_mad/remotes/dockerhub/dockerfiles/alpine
@@ -19,4 +19,4 @@ RUN rc-update add sshd default && \
     rc-update add udev default && \
     rc-update add networking default
 
-RUN echo 'rc_sys=""' >> /etc/rc.conf
+RUN sed -i '/rc_sys/s/^/#/' /etc/rc.conf