diff --git a/libnss_aad/alpine/Dockerfile b/libnss_aad/alpine/Dockerfile
new file mode 100644
index 0000000..a349aa2
--- /dev/null
+++ b/libnss_aad/alpine/Dockerfile
@@ -0,0 +1,19 @@
+FROM alpine:3.14
+
+RUN >> /etc/apk/repositories && \
+    apk update && apk add -y \
+        automake \
+        cmake \
+        curl \
+        git \
+        indent \
+        jansson-dev \
+        libsodium-dev \
+        libtool \
+        quilt \
+        libsds
+
+WORKDIR /usr/src/libnss_aad
+COPY . /usr/src/libnss_aad
+RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    make -us -uc -i'.git' && \
diff --git a/libnss_aad/debian/Dockerfile b/libnss_aad/debian/Dockerfile
new file mode 100644
index 0000000..a251ba8
--- /dev/null
+++ b/libnss_aad/debian/Dockerfile
@@ -0,0 +1,39 @@
+FROM debian:11.0
+ARG VERSION
+ARG DEBVER
+
+RUN echo "deb http://http.us.debian.org/debian bullseye main" \
+        >> /etc/apt/sources.list && \
+    apt update && apt install -y \
+        automake \
+        autopoint \
+        build-essential \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        git \
+        indent \
+        libcurl4-openssl-dev \
+        libjansson-dev \
+        libjwt-dev \
+        libsodium-dev \
+        libssl-dev \
+        libtool \
+        libxcrypt-dev \
+        pkg-config \
+        quilt
+
+ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
+    SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
+WORKDIR /tmp
+RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
+
+WORKDIR /usr/src/libnss_aad
+COPY . /usr/src/libnss_aad
+RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -i'.git' && \
+    dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
diff --git a/libnss_aad/rocky/Dockerfile b/libnss_aad/rocky/Dockerfile
new file mode 100644
index 0000000..1c456a7
--- /dev/null
+++ b/libnss_aad/rocky/Dockerfile
@@ -0,0 +1,29 @@
+FROM rockylinux/rockylinux:8.4
+
+RUN echo "deb http://http.us.debian.org/debian bullseye main" \
+        >> /etc/dnf/dnf.conf && \
+    dnf update && dnf install -y \
+        automake \
+        cmake \
+        curl \
+        git \
+        indent \
+        libcurl-devel \
+        jansson-devel \
+        libtool \
+        libxcrypt-devel \
+        quilt
+        
+ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
+    SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
+WORKDIR /tmp
+RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
+
+WORKDIR /usr/src/libnss_aad
+COPY . /usr/src/libnss_aad
+
+RUN make depends && \
+    LIB_DIR=/lib64 make -e install
diff --git a/libnss_aad/ubuntu/Dockerfile b/libnss_aad/ubuntu/Dockerfile
new file mode 100644
index 0000000..21f0277
--- /dev/null
+++ b/libnss_aad/ubuntu/Dockerfile
@@ -0,0 +1,70 @@
+FROM ubuntu:20.04
+ARG VERSION
+ARG DEBVER
+
+RUN echo "deb http://http.us.debian.org/debian bullseye main" \
+        >> /etc/apt/sources.list && \
+    apt update && apt install -y \
+        automake \
+        autopoint \
+        build-essential \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        git \
+        indent \
+        libcurl4-openssl-dev \
+        libjansson-dev \
+        libjwt-dev \
+        libsodium-dev \
+        libssl-dev \
+        libtool \
+        libxcrypt-dev \
+        pkg-config \
+        quilt
+
+ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
+    SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
+WORKDIR /tmp
+RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
+
+WORKDIR /usr/src/libnss_aad
+COPY . /usr/src/libnss_aad
+RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -i'.git' && \
+    dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
+RUN apt update && apt install -y \
+        software-properties-common && \
+    add-apt-repository -y ppa:lramage/sds && \
+    add-apt-repository -y ppa:jnchi/ppa
+
+RUN apt update && apt install -y \
+        automake \
+        autopoint \
+        build-essential \
+        cmake \
+        curl \
+        debhelper \
+        devscripts \
+        git \
+        indent \
+        libcurl4-openssl-dev \
+        libjansson-dev \
+        libjwt-dev \
+        libsds-dev \
+        libsodium-dev \
+        libssl-dev \
+        libtool \
+        libxcrypt-dev \
+        pkg-config \
+        quilt
+
+WORKDIR /usr/src/libnss_aad
+COPY . /usr/src/libnss_aad
+RUN tar cvzf "../libnss-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -i'.git' && \
+    dpkg -i "../libnss-aad_${VERSION}-${DEBVER}_amd64.deb"
diff --git a/openvpn-auth-aad/alpine/Dockerfile b/openvpn-auth-aad/alpine/Dockerfile
new file mode 100644
index 0000000..147f413
--- /dev/null
+++ b/openvpn-auth-aad/alpine/Dockerfile
@@ -0,0 +1,15 @@
+FROM aad-for-linux/pam_aad:alpine
+
+RUN apk update -qq && apk add -y \
+      liblz4-dev \
+      liblzo2-dev \
+      openvpn \
+      wget
+
+WORKDIR /usr/src/openvpn-auth-aad
+COPY . /usr/src/openvpn-auth-aad
+RUN useradd -m dev -s /bin/bash && \
+    chown -R dev:dev /usr/src/openvpn-auth-aad
+
+RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    make -us -uc -d -i'(.*)' && \
diff --git a/openvpn-auth-aad/debian/Dockerfile b/openvpn-auth-aad/debian/Dockerfile
new file mode 100644
index 0000000..59ececa
--- /dev/null
+++ b/openvpn-auth-aad/debian/Dockerfile
@@ -0,0 +1,19 @@
+FROM aad-for-linux/pam_aad:debian
+ARG VERSION
+ARG DEBVER
+
+RUN apt-get update -qq && apt-get install -y \
+      liblz4-dev \
+      liblzo2-dev \
+      openvpn \
+      wget
+
+WORKDIR /usr/src/openvpn-auth-aad
+COPY . /usr/src/openvpn-auth-aad
+RUN useradd -m dev -s /bin/bash && \
+    chown -R dev:dev /usr/src/openvpn-auth-aad
+
+RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -d -i'(.*)' && \
+    dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"
+
diff --git a/openvpn-auth-aad/rocky/Dockerfile b/openvpn-auth-aad/rocky/Dockerfile
new file mode 100644
index 0000000..11f2fbd
--- /dev/null
+++ b/openvpn-auth-aad/rocky/Dockerfile
@@ -0,0 +1,15 @@
+FROM aad-for-linux/pam_aad:rocky
+
+RUN dnf update -qq && dnf install -y \
+      liblz4-dev \
+      liblzo2-dev \
+      openvpn \
+      wget
+
+WORKDIR /usr/src/openvpn-auth-aad
+COPY . /usr/src/openvpn-auth-aad
+RUN useradd -m dev -s /bin/bash && \
+    chown -R dev:dev /usr/src/openvpn-auth-aad
+
+RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    make -us -uc -d -i'(.*)' && \
diff --git a/openvpn-auth-aad/ubuntu/Dockerfile b/openvpn-auth-aad/ubuntu/Dockerfile
new file mode 100644
index 0000000..e6a38ae
--- /dev/null
+++ b/openvpn-auth-aad/ubuntu/Dockerfile
@@ -0,0 +1,19 @@
+FROM openvpn_auth_aad/ubuntu/Dockerfile
+ARG VERSION
+ARG DEBVER
+
+RUN apt-get update -qq && apt-get install -y \
+      liblz4-dev \
+      liblzo2-dev \
+      openvpn \
+      wget
+
+WORKDIR /usr/src/openvpn-auth-aad
+COPY . /usr/src/openvpn-auth-aad
+RUN useradd -m dev -s /bin/bash && \
+    chown -R dev:dev /usr/src/openvpn-auth-aad
+
+RUN tar cvzf "../openvpn-auth-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -d -i'(.*)' && \
+    dpkg -i "../openvpn-auth-aad_${VERSION}-${DEBVER}_amd64.deb"
+
diff --git a/pam_aad/alpine/Dockerfile b/pam_aad/alpine/Dockerfile
new file mode 100644
index 0000000..34d3a89
--- /dev/null
+++ b/pam_aad/alpine/Dockerfile
@@ -0,0 +1,18 @@
+FROM alpine:3.14
+
+RUN >> /etc/apk/repositories && \
+    apk update && apk add -y \
+        automake \
+        curl \
+        git \
+        indent \
+        libjansson-dev \
+        libpam0g-dev \
+        quilt \
+        libsds
+
+WORKDIR /usr/src/pam_aad
+COPY . /usr/src/pam_aad
+RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    make -us -uc -d -i'(.*)' &&
+ 
diff --git a/pam_aad/debian/Dockerfile b/pam_aad/debian/Dockerfile
new file mode 100644
index 0000000..e348767
--- /dev/null
+++ b/pam_aad/debian/Dockerfile
@@ -0,0 +1,37 @@
+FROM debian:11.0
+ARG VERSION
+ARG DEBVER
+
+RUN echo "deb http://http.us.debian.org/debian bullseye main" \
+        >> /etc/apt/sources.list && \
+    apt update && apt install -y \
+        automake \
+        build-essential \
+        curl \
+        debhelper \
+        devscripts \
+        git \
+        indent \
+        libcurl4-openssl-dev \
+        libjansson-dev \
+        libjwt-dev \
+        libpam0g-dev \
+        libssl-dev \
+        libtool \
+        pkg-config \
+        quilt \
+        uuid-dev
+
+ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
+    SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
+WORKDIR /tmp
+RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
+
+WORKDIR /usr/src/pam_aad
+COPY . /usr/src/pam_aad
+RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -d -i'(.*)' && \
+    dpkg -i "../libpam-aad_${VERSION}-${DEBVER}_amd64.deb"
diff --git a/pam_aad/rocky/Dockerfile b/pam_aad/rocky/Dockerfile
new file mode 100644
index 0000000..842b606
--- /dev/null
+++ b/pam_aad/rocky/Dockerfile
@@ -0,0 +1,28 @@
+FROM rockylinux/rockylinux:8.4
+
+RUN >> /etc/dnf/dnf.conf && \
+    dnf update && dnf install -y \
+        automake \
+        curl \
+        git \
+        indent \
+        libjansson-dev \
+        libtool \
+        quilt \
+
+ENV SDSMIRROR="https://gitlab.com/oxr463/sds/-/jobs/210491217/artifacts/raw" \
+    SDSVERSION="2.0.0" SDSDEBVERSION="2.0.0-1"
+WORKDIR /tmp
+RUN curl -LO "${SDSMIRROR}/libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    curl -LO "${SDSMIRROR}/libsds-dev_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds${SDSVERSION}_${SDSDEBVERSION}_amd64.deb" && \
+    dpkg -i "libsds-dev_${SDSDEBVERSION}_amd64.deb"
+
+WORKDIR /usr/src/pam_aad
+COPY . /usr/src/pam_aad
+
+ENV PAMROC="/lib64/security" \
+    NSS_PATH="$"{NSS_PATH}:/usr/local/lib:/usr/local/lib64"    
+RUN ./bootstrap.sh && \
+    ./configure --with-pam-dir="${PAMROC}" && \
+    make && make install
diff --git a/pam_aad/ubuntu/Dockerfile b/pam_aad/ubuntu/Dockerfile
new file mode 100644
index 0000000..1d4c02b
--- /dev/null
+++ b/pam_aad/ubuntu/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:20.04
+ARG VERSION
+ARG DEBVER
+
+RUN apt update && apt install -y \
+        software-properties-common && \
+    add-apt-repository -y ppa:lramage/sds
+
+RUN apt update && apt install -y \
+        automake \
+        build-essential \
+        curl \
+        debhelper \
+        devscripts \
+        git \
+        indent \
+        libcurl4-openssl-dev \
+        libjansson-dev \
+        libjwt-dev \
+        libpam0g-dev \
+        libsds-dev \
+        libssl-dev \
+        libtool \
+        pkg-config \
+        quilt \
+        uuid-dev
+
+WORKDIR /usr/src/pam_aad
+COPY . /usr/src/pam_aad
+RUN tar cvzf "../pam-aad_${VERSION}.orig.tar.gz" --exclude='.git*' . && \
+    debuild -us -uc -d -i'(.*)' && \
+    dpkg -i "../libpam-aad_${VERSION}-${DEBVER}_amd64.deb"