diff --git a/README.md b/README.md
index 000f812..b23e6c7 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ A collection of delicious docker recipes.
 
 ## Media
 
-- [x] aircast-arm :musical_note:
+- [x] aircast-arm64 :musical_note:
 - [x] cmus
 - [x] cmus-arm
 - [x] darkice :musical_note:
diff --git a/aircast-arm/Dockerfile b/aircast-arm/Dockerfile
deleted file mode 100644
index 925a2f7..0000000
--- a/aircast-arm/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Dockerfile for aircast-arm
-#
-
-FROM alpine:3
-MAINTAINER EasyPi Software Foundation
-
-ENV APP_ARCH=arm
-ENV APP_FILE=aircast-$APP_ARCH-static
-ENV APP_URL=https://github.com/philippe44/AirConnect/raw/master/bin/$APP_FILE
-
-
-RUN set -xe \
- && apk add --no-cache curl \
- && curl -sSL -o /usr/local/bin/aircast $APP_URL \
- && chmod +x /usr/local/bin/aircast
-
-CMD ["aircast", "-Z"]
diff --git a/aircast-arm64/Dockerfile b/aircast-arm64/Dockerfile
new file mode 100644
index 0000000..91bd440
--- /dev/null
+++ b/aircast-arm64/Dockerfile
@@ -0,0 +1,19 @@
+#
+# Dockerfile for aircast-arm64
+#
+
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
+
+ARG APP_OS=linux
+ARG APP_ARCH=aarch64
+ARG APP_FILE=aircast-${APP_OS}-${APP_ARCH}-static
+ARG APP_URL=https://github.com/philippe44/AirConnect/raw/master/bin/${APP_FILE}
+
+RUN set -xe \
+ && apk add --no-cache curl \
+ && curl -sSL -o /usr/local/bin/aircast ${APP_URL} \
+ && chmod +x /usr/local/bin/aircast \
+ && aircast -t
+
+CMD ["aircast", "-Z"]
diff --git a/aircast-arm/README.md b/aircast-arm64/README.md
similarity index 100%
rename from aircast-arm/README.md
rename to aircast-arm64/README.md
diff --git a/aircast-arm/docker-compose.yml b/aircast-arm64/docker-compose.yml
similarity index 73%
rename from aircast-arm/docker-compose.yml
rename to aircast-arm64/docker-compose.yml
index d36ceb8..ecd34ba 100644
--- a/aircast-arm/docker-compose.yml
+++ b/aircast-arm64/docker-compose.yml
@@ -1,6 +1,6 @@
 version: "3.8"
 services:
   aircast:
-    image: easypi/aircast-arm
+    image: easypi/aircast-arm64
     network_mode: host
     restart: unless-stopped
diff --git a/owncast/Dockerfile b/owncast/Dockerfile
new file mode 100644
index 0000000..500d571
--- /dev/null
+++ b/owncast/Dockerfile
@@ -0,0 +1,26 @@
+#
+# Dockerfile for owncast
+#
+
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
+
+ARG TARGETPLATFORM
+
+ENV OWNCAST_VERSION=0.0.10
+
+WORKDIR /app
+
+RUN set -xe \
+  && OWNCAST_ARCH=$(echo $TARGETPLATFORM | sed -e 's@^linux/@@' \
+                                               -e 's@386@32bit@' \
+                                               -e 's@amd64@64bit@' \
+                                               -e 's@arm/v7@arm7@' \
+                                               -e 's@arm64@arm64@') \
+  && OWNCAST_FILE=owncast-${OWNCAST_VERSION}-linux-${OWNCAST_ARCH}.zip \
+  && apk add --no-cache curl ffmpeg ffmpeg-libs gcompat \
+  && curl -sSLO https://github.com/owncast/owncast/releases/download/v${OWNCAST_VERSION}/${OWNCAST_FILE} \
+  && unzip ${OWNCAST_FILE} \
+  && rm ${OWNCAST_FILE}
+
+CMD ["/app/owncast"]