diff --git a/rpios-builder-media/Containerfile.arm64 b/rpios-builder-media/Containerfile.arm64
new file mode 100644
index 0000000..9a4ee54
--- /dev/null
+++ b/rpios-builder-media/Containerfile.arm64
@@ -0,0 +1,13 @@
+FROM ghcr.io/nakarma/containers/rpios-builder:arm64-latest
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update \
+    && apt -y full-upgrade \
+    && apt -y install libsdl*dev \
+    && apt -y build-dep mesa \
+    && apt-get -y --purge autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+CMD ["bash"]
diff --git a/rpios-builder-media/Containerfile.armhf b/rpios-builder-media/Containerfile.armhf
new file mode 100644
index 0000000..2eac705
--- /dev/null
+++ b/rpios-builder-media/Containerfile.armhf
@@ -0,0 +1,13 @@
+FROM ghcr.io/nakarma/containers/rpios-builder:armhf-latest
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update \
+    && apt -y full-upgrade \
+    && apt -y install libsdl*dev \
+    && apt -y build-dep mesa \
+    && apt-get -y --purge autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+CMD ["bash"]
diff --git a/rpios-builder-media/build.sh b/rpios-builder-media/build.sh
new file mode 100755
index 0000000..dabaaaf
--- /dev/null
+++ b/rpios-builder-media/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+IMAGE=${PWD##*/}
+REGISTRY=ghcr.io/nakarma/containers/
+
+BUILD() {
+    podman build -t $REGISTRY$IMAGE:$ARCH-latest -f $1
+}
+
+case "$1" in
+    armhf)
+        ARCH=armhf
+        BUILD ./Containerfile.armhf
+    ;;
+    arm64)
+        ARCH=arm64
+        BUILD ./Containerfile.arm64
+    ;;
+    *)
+        echo ""
+        echo "Usage: $(basename $0) {armhf|arm64}"
+        echo ""
+    ;;
+esac
diff --git a/rpios-builder/Containerfile.arm64 b/rpios-builder/Containerfile.arm64
new file mode 100644
index 0000000..4711dd7
--- /dev/null
+++ b/rpios-builder/Containerfile.arm64
@@ -0,0 +1,12 @@
+FROM ghcr.io/nakarma/containers/rpios-base:arm64-latest
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update \
+    && apt -y full-upgrade \
+    && apt -y install build-essential neovim git subversion fakeroot autoconf automake \
+    && apt-get -y --purge autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+CMD ["bash"]
diff --git a/rpios-builder/Containerfile.armhf b/rpios-builder/Containerfile.armhf
new file mode 100644
index 0000000..59be4aa
--- /dev/null
+++ b/rpios-builder/Containerfile.armhf
@@ -0,0 +1,12 @@
+FROM ghcr.io/nakarma/containers/rpios-base:armhf-latest
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update \
+    && apt -y full-upgrade \
+    && apt -y install build-essential neovim git subversion fakeroot autoconf automake \
+    && apt-get -y --purge autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+CMD ["bash"]
diff --git a/rpios-builder/build.sh b/rpios-builder/build.sh
new file mode 100755
index 0000000..dabaaaf
--- /dev/null
+++ b/rpios-builder/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+IMAGE=${PWD##*/}
+REGISTRY=ghcr.io/nakarma/containers/
+
+BUILD() {
+    podman build -t $REGISTRY$IMAGE:$ARCH-latest -f $1
+}
+
+case "$1" in
+    armhf)
+        ARCH=armhf
+        BUILD ./Containerfile.armhf
+    ;;
+    arm64)
+        ARCH=arm64
+        BUILD ./Containerfile.arm64
+    ;;
+    *)
+        echo ""
+        echo "Usage: $(basename $0) {armhf|arm64}"
+        echo ""
+    ;;
+esac
diff --git a/rpios-gnome/Containerfile.arm64 b/rpios-gnome/Containerfile.arm64
index d861de3..42be86f 100644
--- a/rpios-gnome/Containerfile.arm64
+++ b/rpios-gnome/Containerfile.arm64
@@ -5,6 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt update \
     && apt -y full-upgrade \
     && apt-get -y --no-install-recommends install \
+    bluez bluez-firmware bluez-obexd \
     dbus systemd systemd-sysv cron anacron ecryptfs-utils \
     desktop-base gdm3 gnome-session gnome-shell \
     gnome-terminal gnome-shell-extensions gnome-shell-extensions-extra \