diff --git a/bin/check-bad-include.sh b/bin/check-bad-include.sh
index 794f226ab..37c0995a6 100755
--- a/bin/check-bad-include.sh
+++ b/bin/check-bad-include.sh
@@ -2,4 +2,4 @@
 
 # find files that incorrectly include top level files
 
-grep -RiP '.. include:: .*/[^_\/]+[^\/]*\.rst' source/
+rg -i '.. include:: .*/[^_\/]+[^\/]*\.rst' source/
diff --git a/bin/check-bad-toc.sh b/bin/check-bad-toc.sh
index 8752381b1..f04946452 100755
--- a/bin/check-bad-toc.sh
+++ b/bin/check-bad-toc.sh
@@ -5,5 +5,5 @@
 
 find configs/ -name '*_toc.txt' -print0 | 
 	while IFS= read -r -d '' file_name; do 
-		grep -Pi '.*/_[^\/]*' "$file_name"
+		rg -i '.*/_[^\/]*' "$file_name"
 	done
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 59f2a41ad..e5bf1a221 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,34 +1,23 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com
 
-FROM debian:stable-slim
+FROM alpine:3
 
-RUN apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		--no-install-recommends \
+RUN apk add --no-cache \
+		bash \
 		dumb-init \
 		git \
-		gosu \
 		make \
-		python3-pip \
+		py3-pip \
 		ripgrep \
+		shadow \
+		su-exec \
 		zip \
 	&& echo "**** create abc user and make our folders ****" \
 	&& useradd -u 1000 -U -d /config -s /bin/false abc \
 	&& usermod -G users abc \
 	&& mkdir /build && chown abc:abc /build \
-	&& mkdir /config && chown abc:abc /config \
-	&& echo "**** cleanup ****" \
-	&& apt-get autoremove \
-	&& apt-get clean \
-	&& rm -rf \
-		/tmp/* \
-		/var/cache/debconf/*-old \
-		/var/lib/apt/lists/* \
-		/var/lib/dpkg/status-old \
-		/var/lib/sgml-base/supercatalog.old \
-		/var/log/apt/term.log \
-		/var/tmp/*
+	&& mkdir /config && chown abc:abc /config
 
 RUN --mount=type=bind,source=requirements.txt,target=/tmp/requirements.txt \
 	python3 -m pip install -r /tmp/requirements.txt --no-cache-dir \
diff --git a/docker/root/init b/docker/root/init
index 05ec1431c..5b7737b28 100755
--- a/docker/root/init
+++ b/docker/root/init
@@ -42,5 +42,5 @@ fi
 if [ "$(id -u)" == "$(id -u abc)" ]; then
 	exec dumb-init -- "$@"
 else
-	exec dumb-init -- gosu abc "$@"
+	exec dumb-init -- su-exec abc:abc "$@"
 fi