diff --git a/scripts/docker/dists/alpine/Dockerfile b/scripts/docker/dists/alpine/Dockerfile
index 29655258324dc..04c0101223b8b 100644
--- a/scripts/docker/dists/alpine/Dockerfile
+++ b/scripts/docker/dists/alpine/Dockerfile
@@ -1,3 +1,8 @@
+# Auto generated for alpine
+# from scripts/docker/m4/Dockerfile.alpine.m4
+#
+# Rebuild this file with `make docker.alpine.regen`
+#
 ARG from=alpine:3.13
 FROM ${from} as build
 
@@ -10,17 +15,23 @@ RUN apk add git gcc make
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
+
+#
+#  Copy the FreeRADIUS directory in
+#
+COPY . .
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
 
 #
 #  Install build dependencies
@@ -33,7 +44,7 @@ RUN apk add linux-headers
 RUN apk add pcre-dev libidn-dev krb5-dev samba-dev curl-dev json-c-dev
 RUN apk add openldap-dev unbound-dev
 # languages
-RUN apk add ruby-dev perl-dev python2-dev
+RUN apk add ruby-dev perl-dev python2-dev python3-dev
 # databases
 RUN apk add hiredis-dev libmemcached-dev gdbm-dev libcouchbase-dev
 # sql
@@ -69,14 +80,15 @@ RUN apk update \
     && apk add libcurl json-c libldap hiredis sqlite-dev \
 #RUN apk add libidn krb5
 #RUN apk add unbound-libs
-#RUN apk add ruby-libs perl python2-dev
+#RUN apk add ruby-libs perl python2-dev python3-dev
 #RUN apk add libmemcached gdbm libcouchbase
 #RUN apk add postgresql-dev mariadb-dev unixodbc-dev
     \
     && ln -s /opt/etc/raddb /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker//etc/docker-entrypoint.sh.alpine docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/centos7/Dockerfile b/scripts/docker/dists/centos7/Dockerfile
index 9d3cdf942fc75..3b68b85649f3a 100644
--- a/scripts/docker/dists/centos7/Dockerfile
+++ b/scripts/docker/dists/centos7/Dockerfile
@@ -7,6 +7,7 @@ ARG from=centos:7
 FROM ${from} as build
 
 
+
 #
 #  Install build tools
 #
@@ -18,17 +19,22 @@ RUN yum install -y openssl
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
+
+#
+#  Copy the FreeRADIUS directory in
+#
+COPY . .
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+RUN git clean -fdxx \
+ && git reset --hard HEAD
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Other requirements
@@ -63,9 +69,11 @@ ENV BUILDDIR=/root/rpmbuild
 RUN rpmdev-setuptree
 
 RUN ./configure
-RUN make freeradius-server-$(cat VERSION).tar.bz2
-RUN cp freeradius-server-$(cat VERSION).tar.bz2 $BUILDDIR/SOURCES/
+RUN cp VERSION /VERSION
+RUN make freeradius-server-$(cat /VERSION).tar.bz2
+RUN cp freeradius-server-$(cat /VERSION).tar.bz2 $BUILDDIR/SOURCES/
 RUN cp -r redhat/* $BUILDDIR/SOURCES/
+RUN sed -i "s/^Version:.*/Version: $(cat /VERSION)/" redhat/freeradius.spec
 RUN cp -r redhat/freeradius.spec $BUILDDIR/SPECS/
 WORKDIR $BUILDDIR
 
@@ -73,7 +81,7 @@ WORKDIR $BUILDDIR
 #  Build the server
 #
 ENV QA_RPATHS=0x0003
-RUN rpmbuild -bb --define '_release $release' "$BUILDDIR/SPECS/freeradius.spec"
+RUN rpmbuild -bb --define "_release $(cat /VERSION)" "$BUILDDIR/SPECS/freeradius.spec"
 
 RUN mkdir /root/rpms
 RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
@@ -82,8 +90,10 @@ RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
 #  Clean environment and run the server
 #
 FROM ${from}
+
 COPY --from=build /root/rpms /tmp/
 
+
 # Use LTB's openldap packages intead of the distribution version to avoid linking against NSS
 RUN echo $'[ltb-project]\n\
 name=LTB project packages\n\
@@ -100,8 +110,9 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
     \
     && yum install -y /tmp/*.rpm
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker//etc/docker-entrypoint.sh.rpm docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/debian10/Dockerfile b/scripts/docker/dists/debian10/Dockerfile
index 7cd14ecb6ffe4..ca2722e5cbf0c 100644
--- a/scripts/docker/dists/debian10/Dockerfile
+++ b/scripts/docker/dists/debian10/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,23 +45,31 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 RUN apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/debian11/Dockerfile b/scripts/docker/dists/debian11/Dockerfile
index 0c6addd307d04..918512beacb8a 100644
--- a/scripts/docker/dists/debian11/Dockerfile
+++ b/scripts/docker/dists/debian11/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,28 +45,36 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 ARG freerad_uid=101
 ARG freerad_gid=101
 
 RUN groupadd -g ${freerad_gid} -r freerad \
-    && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
-    && apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
+ && apt-get update \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/debian12/Dockerfile b/scripts/docker/dists/debian12/Dockerfile
index 4010c1fa7bdfe..5eb2af44e72af 100644
--- a/scripts/docker/dists/debian12/Dockerfile
+++ b/scripts/docker/dists/debian12/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,28 +45,36 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 ARG freerad_uid=101
 ARG freerad_gid=101
 
 RUN groupadd -g ${freerad_gid} -r freerad \
-    && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
-    && apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
+ && apt-get update \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/debiansid/Dockerfile b/scripts/docker/dists/debiansid/Dockerfile
index 191ec4968f96d..3a2f9432c4a3d 100644
--- a/scripts/docker/dists/debiansid/Dockerfile
+++ b/scripts/docker/dists/debiansid/Dockerfile
@@ -1,3 +1,8 @@
+# Auto generated for debiansid
+# from scripts/docker/m4/Dockerfile.deb.m4
+#
+# Rebuild this file with `make docker.debiansid.regen`
+#
 ARG from=debian:sid
 FROM ${from} as build
 
@@ -12,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
+
+#
+#  Copy the FreeRADIUS directory in
+#
+COPY . .
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+RUN git clean -fdxx \
+ && git reset --hard HEAD
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -36,28 +45,36 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 ARG freerad_uid=101
 ARG freerad_gid=101
 
 RUN groupadd -g ${freerad_gid} -r freerad \
-    && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
-    && apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
+ && apt-get update \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/rocky8/Dockerfile b/scripts/docker/dists/rocky8/Dockerfile
index 3f42d9e137f45..e2908726a8c12 100644
--- a/scripts/docker/dists/rocky8/Dockerfile
+++ b/scripts/docker/dists/rocky8/Dockerfile
@@ -6,6 +6,11 @@
 ARG from=rockylinux/rockylinux:8
 FROM ${from} as build
 
+#
+#  Install yum
+#
+RUN dnf install -y yum
+
 RUN rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial
 
 #
@@ -19,17 +24,22 @@ RUN yum install -y rpmdevtools openssl dnf-utils
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
+
+#
+#  Copy the FreeRADIUS directory in
+#
+COPY . .
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+RUN git clean -fdxx \
+ && git reset --hard HEAD
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Other requirements
@@ -70,9 +80,11 @@ ENV BUILDDIR=/root/rpmbuild
 RUN rpmdev-setuptree
 
 RUN ./configure
-RUN make freeradius-server-$(cat VERSION).tar.bz2
-RUN cp freeradius-server-$(cat VERSION).tar.bz2 $BUILDDIR/SOURCES/
+RUN cp VERSION /VERSION
+RUN make freeradius-server-$(cat /VERSION).tar.bz2
+RUN cp freeradius-server-$(cat /VERSION).tar.bz2 $BUILDDIR/SOURCES/
 RUN cp -r redhat/* $BUILDDIR/SOURCES/
+RUN sed -i "s/^Version:.*/Version: $(cat /VERSION)/" redhat/freeradius.spec
 RUN cp -r redhat/freeradius.spec $BUILDDIR/SPECS/
 WORKDIR $BUILDDIR
 
@@ -80,7 +92,7 @@ WORKDIR $BUILDDIR
 #  Build the server
 #
 ENV QA_RPATHS=0x0003
-RUN rpmbuild -bb --define '_release $release' "$BUILDDIR/SPECS/freeradius.spec"
+RUN rpmbuild -bb --define "_release $(cat /VERSION)" "$BUILDDIR/SPECS/freeradius.spec"
 
 RUN mkdir /root/rpms
 RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
@@ -89,8 +101,14 @@ RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
 #  Clean environment and run the server
 #
 FROM ${from}
+
 COPY --from=build /root/rpms /tmp/
 
+#
+#  Install yum
+#
+RUN dnf install -y yum
+
 # Use LTB's openldap packages intead of the distribution version to avoid linking against NSS
 RUN echo $'[ltb-project]\n\
 name=LTB project packages\n\
@@ -101,6 +119,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-LTB-project'\
 > /etc/yum.repos.d/ltb-project.repo \
     && rpm --import https://ltb-project.org/lib/RPM-GPG-KEY-LTB-project
 
+#  Enable powertools repo
+RUN yum config-manager --enable powertools
 
 #  EPEL repository for freetds and hiredis
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
@@ -114,8 +134,9 @@ RUN groupadd -g ${radiusd_gid} -r radiusd \
     && useradd -u ${radiusd_uid} -g radiusd -r -M -d /home/radiusd -s /sbin/nologin radiusd \
     && yum install -y /tmp/*.rpm
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker//etc/docker-entrypoint.sh.rpm docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/rocky9/Dockerfile b/scripts/docker/dists/rocky9/Dockerfile
index 241be86363b92..ba7cd33741209 100644
--- a/scripts/docker/dists/rocky9/Dockerfile
+++ b/scripts/docker/dists/rocky9/Dockerfile
@@ -24,17 +24,22 @@ RUN yum install -y rpmdevtools openssl dnf-utils
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Other requirements
@@ -63,9 +68,11 @@ ENV BUILDDIR=/root/rpmbuild
 RUN rpmdev-setuptree
 
 RUN ./configure
-RUN make freeradius-server-$(cat VERSION).tar.bz2
-RUN cp freeradius-server-$(cat VERSION).tar.bz2 $BUILDDIR/SOURCES/
+RUN cp VERSION /VERSION
+RUN make freeradius-server-$(cat /VERSION).tar.bz2
+RUN cp freeradius-server-$(cat /VERSION).tar.bz2 $BUILDDIR/SOURCES/
 RUN cp -r redhat/* $BUILDDIR/SOURCES/
+RUN sed -i "s/^Version:.*/Version: $(cat /VERSION)/" redhat/freeradius.spec
 RUN cp -r redhat/freeradius.spec $BUILDDIR/SPECS/
 WORKDIR $BUILDDIR
 
@@ -73,7 +80,7 @@ WORKDIR $BUILDDIR
 #  Build the server
 #
 ENV QA_RPATHS=0x0003
-RUN rpmbuild -bb --define '_release $release' "$BUILDDIR/SPECS/freeradius.spec"
+RUN rpmbuild -bb --define "_release $(cat /VERSION)" "$BUILDDIR/SPECS/freeradius.spec"
 
 RUN mkdir /root/rpms
 RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
@@ -82,8 +89,14 @@ RUN mv $BUILDDIR/RPMS/*/*.rpm /root/rpms/
 #  Clean environment and run the server
 #
 FROM ${from}
+
 COPY --from=build /root/rpms /tmp/
 
+#
+#  Install yum
+#
+RUN dnf install -y yum
+
 
 #  Needed for mysql-libs on Rocky 9
 RUN yum install -y yum-utils
@@ -101,8 +114,9 @@ RUN groupadd -g ${radiusd_gid} -r radiusd \
     && useradd -u ${radiusd_uid} -g radiusd -r -M -d /home/radiusd -s /sbin/nologin radiusd \
     && yum install -y /tmp/*.rpm
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker//etc/docker-entrypoint.sh.rpm docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/ubuntu18/Dockerfile b/scripts/docker/dists/ubuntu18/Dockerfile
index 911c80c5b6a13..1e1d02ff9355d 100644
--- a/scripts/docker/dists/ubuntu18/Dockerfile
+++ b/scripts/docker/dists/ubuntu18/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,23 +45,31 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 RUN apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/ubuntu20/Dockerfile b/scripts/docker/dists/ubuntu20/Dockerfile
index 7223068442ba3..a42b1809d0174 100644
--- a/scripts/docker/dists/ubuntu20/Dockerfile
+++ b/scripts/docker/dists/ubuntu20/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,23 +45,31 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 RUN apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/ubuntu22/Dockerfile b/scripts/docker/dists/ubuntu22/Dockerfile
index 46e36ddaeb6b3..4bebcf1f7d18b 100644
--- a/scripts/docker/dists/ubuntu22/Dockerfile
+++ b/scripts/docker/dists/ubuntu22/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,28 +45,36 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 ARG freerad_uid=101
 ARG freerad_gid=101
 
 RUN groupadd -g ${freerad_gid} -r freerad \
-    && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
-    && apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
+ && apt-get update \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/scripts/docker/dists/ubuntu24/Dockerfile b/scripts/docker/dists/ubuntu24/Dockerfile
index a533b4fd208d4..05d1f7d5d0639 100644
--- a/scripts/docker/dists/ubuntu24/Dockerfile
+++ b/scripts/docker/dists/ubuntu24/Dockerfile
@@ -17,23 +17,27 @@ RUN apt-get install -y devscripts equivs git quilt gcc
 #
 #  Create build directory
 #
-RUN mkdir -p /usr/local/src/repositories
-WORKDIR /usr/local/src/repositories
+RUN mkdir -p /usr/local/src/repositories/freeradius-server
+WORKDIR /usr/local/src/repositories/freeradius-server/
 
 #
-#  Shallow clone the FreeRADIUS source
+#  Copy the FreeRADIUS directory in
 #
-ARG source=https://github.com/FreeRADIUS/freeradius-server.git
-ARG release=v3.2.x
+COPY . .
 
-RUN git clone --depth 1 --single-branch --branch ${release} ${source}
-WORKDIR freeradius-server
+#
+#  Clean up tree - we want to build from the latest commit, not from
+#  any cruft left around on the local system
+#
+RUN git clean -fdxx \
+ && git reset --hard HEAD
+
+RUN [ -z "$release" ] || git checkout ${release}
 
 #
 #  Install build dependencies
 #
-RUN git checkout ${release}; \
-    if [ -e ./debian/control.in ]; then \
+RUN if [ -e ./debian/control.in ]; then \
         debian/rules debian/control; \
     fi; \
     echo 'y' | mk-build-deps -irt'apt-get -yV' debian/control
@@ -41,28 +45,36 @@ RUN git checkout ${release}; \
 #
 #  Build the server
 #
-RUN make -j2 deb
+#  Work around fakeroot problems in Docker when building for different
+#  platforms - doesn't matter as we run as root in the container anyway.
+#
+#RUN make -j$(nproc) deb
+RUN debian/rules debian/control \
+ && dpkg-buildpackage --jobs=auto -b -uc
 
 #
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG DEBIAN_FRONTEND=noninteractive
+
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 
 ARG freerad_uid=101
 ARG freerad_gid=101
 
 RUN groupadd -g ${freerad_gid} -r freerad \
-    && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
-    && apt-get update \
-    && apt-get install -y /tmp/*.deb \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/* /tmp/*.deb \
+ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \
+ && apt-get update \
+ && apt-get install -y /tmp/*.deb \
+ && apt-get clean \
+ && rm -r /var/lib/apt/lists/* /tmp/*.deb \
     \
-    && ln -s /etc/freeradius /etc/raddb
+ && ln -s /etc/freeradius /etc/raddb
 
-COPY docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh
+WORKDIR /
+COPY scripts/docker/etc/docker-entrypoint.sh.deb docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
 
 EXPOSE 1812/udp 1813/udp
 ENTRYPOINT ["/docker-entrypoint.sh"]