diff --git a/README.md b/README.md
index 30a8138..4f5a485 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ A collection of delicious docker recipes.
 - [x] monit
 - [x] moodle :beetle:
 - [x] mosquitto
-- [x] motion-arm64 :+1:
+- [x] motion :+1:
 - [x] ndscheduler
 - [x] nfs
 - [x] nginx
diff --git a/motion-arm64/Dockerfile b/motion/Dockerfile
similarity index 87%
rename from motion-arm64/Dockerfile
rename to motion/Dockerfile
index d0b7ee5..34f1eaf 100644
--- a/motion-arm64/Dockerfile
+++ b/motion/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Dockerfile for motion-arm
+# Dockerfile for motion
 #
 
 FROM debian:bookworm
@@ -7,7 +7,8 @@ MAINTAINER EasyPi Software Foundation
 
 ARG MOTION_VERSION=4.7.0
 ARG MOTION_CODENAME=bookworm
-ARG MOTION_FILE=${MOTION_CODENAME}_motion_${MOTION_VERSION}-1_arm64.deb
+ARG MOTION_ARCH=arm64
+ARG MOTION_FILE=${MOTION_CODENAME}_motion_${MOTION_VERSION}-1_${MOTION_ARCH}.deb
 ARG MOTION_URL=https://github.com/Motion-Project/motion/releases/download/release-${MOTION_VERSION}/${MOTION_FILE}
 
 RUN set -xe \
diff --git a/motion-arm64/README.md b/motion/README.md
similarity index 100%
rename from motion-arm64/README.md
rename to motion/README.md
diff --git a/motion-arm64/data/etc/motion.conf b/motion/data/etc/motion.conf
similarity index 100%
rename from motion-arm64/data/etc/motion.conf
rename to motion/data/etc/motion.conf
diff --git a/motion-arm64/data/var/.gitkeep b/motion/data/var/.gitkeep
similarity index 100%
rename from motion-arm64/data/var/.gitkeep
rename to motion/data/var/.gitkeep
diff --git a/motion-arm64/docker-compose.yml b/motion/docker-compose.yml
similarity index 82%
rename from motion-arm64/docker-compose.yml
rename to motion/docker-compose.yml
index cf8bc53..14084d1 100644
--- a/motion-arm64/docker-compose.yml
+++ b/motion/docker-compose.yml
@@ -1,6 +1,9 @@
-version: "3.8"
 services:
   motion:
+    build:
+      context: .
+      args:
+        MOTION_ARCH: arm64
     image: easypi/motion-arm64
     ports:
       - "8080:8080"