diff --git a/semaphore/arm64/Dockerfile b/semaphore/arm64/Dockerfile
new file mode 100644
index 0000000..163164e
--- /dev/null
+++ b/semaphore/arm64/Dockerfile
@@ -0,0 +1,27 @@
+#
+# Dockerfile for semaphore-arm64
+#
+
+FROM debian:bullseye
+MAINTAINER EasyPi Software Foundation
+
+ENV APP_VERSION=2.8.22
+ENV APP_ARCH=arm64
+ENV APP_FILE=semaphore_${APP_VERSION}_linux_${APP_ARCH}.deb
+ENV APP_URL=https://github.com/ansible-semaphore/semaphore
+ENV APP_PACKAGE_URL=${APP_URL}/releases/download/v${APP_VERSION}/${APP_FILE}
+ENV APP_WRAPPER_URL=${APP_URL}/raw/v${APP_VERSION}/deployment/docker/common/semaphore-wrapper
+
+RUN set -xe \
+ && apt update \
+ && apt install -y ansible netcat tini wget \
+ && wget ${APP_PACKAGE_URL} -O ${APP_FILE} \
+ && wget ${APP_WRAPPER_URL} -O /usr/bin/semaphore-wrapper \
+ && chmod +x /usr/bin/semaphore-wrapper \
+ && (dpkg -i ${APP_FILE} || apt -f install -y) \
+ && rm -rf ${APP_FILE} /var/lib/apt/lists/*
+
+EXPOSE 3000
+
+ENTRYPOINT ["/usr/bin/tini", "--"]
+CMD ["/usr/bin/semaphore-wrapper", "/usr/bin/semaphore", "--config", "/etc/semaphore/config.json"]
diff --git a/semaphore/arm64/docker-compose.yml b/semaphore/arm64/docker-compose.yml
new file mode 100644
index 0000000..80385fd
--- /dev/null
+++ b/semaphore/arm64/docker-compose.yml
@@ -0,0 +1,36 @@
+version: "3.8"
+
+services:
+
+  semaphore:
+    image: easypi/semaphore-arm64
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./data/semaphore:/etc/semaphore
+    environment:
+      SEMAPHORE_DB_DIALECT: postgres
+      SEMAPHORE_DB_USER: semaphore
+      SEMAPHORE_DB_PASS: semaphore
+      SEMAPHORE_DB_HOST: postgres
+      SEMAPHORE_DB_PORT: 5432
+      SEMAPHORE_DB: semaphore?sslmode=disable
+      SEMAPHORE_ADMIN: admin
+      SEMAPHORE_ADMIN_NAME: admin
+      SEMAPHORE_ADMIN_PASSWORD: admin
+      SEMAPHORE_ADMIN_EMAIL: admin@localhost
+    depends_on:
+      - postgres
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:14-alpine
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: semaphore
+      POSTGRES_PASSWORD: semaphore
+      POSTGRES_DB: semaphore
+    restart: unless-stopped
diff --git a/semaphore/docker-compose.yml b/semaphore/docker-compose.yml
index f2bf610..e7616fb 100644
--- a/semaphore/docker-compose.yml
+++ b/semaphore/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       SEMAPHORE_DB_HOST: postgres
       SEMAPHORE_DB_PORT: 5432
       SEMAPHORE_DB: semaphore?sslmode=disable
-      SEMAPHORE_PLAYBOOK_PATH: /tmp/semaphore/
       SEMAPHORE_ADMIN: admin
       SEMAPHORE_ADMIN_NAME: admin
       SEMAPHORE_ADMIN_PASSWORD: admin