diff --git a/.buildkite/annotations/artifacts b/.buildkite/annotations/artifacts
index 1bb3a8a6..b9aad80b 100644
--- a/.buildkite/annotations/artifacts
+++ b/.buildkite/annotations/artifacts
@@ -21,13 +21,6 @@
       <a href="artifact://authelia-linux-arm64v8.tar.gz.sha256">authelia-linux-arm64v8.tar.gz.sha256</a>
     </dd>
   </div>
-  <div class="m1">
-      <dt>darwin</dt>
-      <dd>
-        <a href="artifact://authelia-darwin-amd64.tar.gz">authelia-darwin-amd64.tar.gz</a><br>
-        <a href="artifact://authelia-darwin-amd64.tar.gz.sha256">authelia-darwin-amd64.tar.gz.sha256</a>
-      </dd>
-    </div>
   <div class="m1">
       <dt>public_html</dt>
       <dd>
diff --git a/.buildkite/deployment.sh b/.buildkite/deployment.sh
index 1de24e15..f221dccb 100755
--- a/.buildkite/deployment.sh
+++ b/.buildkite/deployment.sh
@@ -38,7 +38,6 @@ steps:
   - label: ":github: Deploy Artifacts"
     command: "ghartifacts.sh"
     depends_on:
-      - "build-docker-darwin-amd64"
       - "build-docker-linux-amd64"
       - "build-docker-linux-arm32v7"
       - "build-docker-linux-arm64v8"
diff --git a/.buildkite/hooks/pre-artifact b/.buildkite/hooks/pre-artifact
index db9c0ee1..b7cd57b9 100755
--- a/.buildkite/hooks/pre-artifact
+++ b/.buildkite/hooks/pre-artifact
@@ -15,14 +15,8 @@ if [[ $BUILDKITE_LABEL =~ ":docker: Build Image" ]]; then
   docker create --name authelia-binary ${DOCKER_IMAGE}:latest
   docker cp authelia-binary:/usr/app/authelia ./authelia-"${OS}"-"${ARCH}"
   docker rm -f authelia-binary
-  if [[ $OS == "linux" ]]; then
-    tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" authelia.service config.template.yml
-  else
-    tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" config.template.yml
-  fi
+  tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" authelia.service config.template.yml
   sha256sum authelia-"${OS}"-"${ARCH}".tar.gz > authelia-"${OS}"-"${ARCH}".tar.gz.sha256
-  # Saving image for push to docker hub, darwin image is not required as OSX utilses linux manifests
-  if [[ $BUILDKITE_LABEL != ":docker: Build Image [darwin]" ]]; then
-    docker save ${DOCKER_IMAGE} | zstdmt -T0 -12 > authelia-image-"${ARCH}".tar.zst
-  fi
+  # Saving image for push to docker hub
+  docker save ${DOCKER_IMAGE} | zstdmt -T0 -12 > authelia-image-"${ARCH}".tar.zst
 fi
\ No newline at end of file
diff --git a/.buildkite/upstream.yml b/.buildkite/pipeline.yml
similarity index 100%
rename from .buildkite/upstream.yml
rename to .buildkite/pipeline.yml
diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh
index 9094ec87..bc51ee47 100755
--- a/.buildkite/steps/buildimages.sh
+++ b/.buildkite/steps/buildimages.sh
@@ -1,32 +1,17 @@
 #!/bin/bash
 set -eu
 
-declare -A BUILDS=(["linux"]="amd64 arm32v7 arm64v8" ["darwin"]="amd64")
+declare -A BUILDS=(["linux"]="amd64 arm32v7 arm64v8")
 
 for BUILD_OS in "${!BUILDS[@]}"; do
   for BUILD_ARCH in ${BUILDS[$BUILD_OS]}; do
-if [[ "${BUILD_OS}" == "darwin" ]]; then
-cat << EOF
-  - label: ":docker: Build Image [${BUILD_OS}]"
-    command: "authelia-scripts docker build --arch=${BUILD_OS}"
-EOF
-else
 cat << EOF
   - label: ":docker: Build Image [${BUILD_ARCH}]"
     command: "authelia-scripts docker build --arch=${BUILD_ARCH}"
-EOF
-fi
-cat << EOF
     agents:
       build: "${BUILD_OS}-${BUILD_ARCH}"
     artifact_paths:
-EOF
-if [[ "${BUILD_OS}" == "linux" ]]; then
-cat << EOF
       - "authelia-image-${BUILD_ARCH}.tar.zst"
-EOF
-fi
-cat << EOF
       - "authelia-${BUILD_OS}-${BUILD_ARCH}.tar.gz"
       - "authelia-${BUILD_OS}-${BUILD_ARCH}.tar.gz.sha256"
     env:
diff --git a/.buildkite/steps/ghartifacts.sh b/.buildkite/steps/ghartifacts.sh
index 3a68abc1..16015b32 100755
--- a/.buildkite/steps/ghartifacts.sh
+++ b/.buildkite/steps/ghartifacts.sh
@@ -7,7 +7,6 @@ for FILES in \
   authelia-linux-amd64.tar.gz authelia-linux-amd64.tar.gz.sha256 \
   authelia-linux-arm32v7.tar.gz authelia-linux-arm32v7.tar.gz.sha256 \
   authelia-linux-arm64v8.tar.gz authelia-linux-arm64v8.tar.gz.sha256 \
-  authelia-darwin-amd64.tar.gz authelia-darwin-amd64.tar.gz.sha256 \
   authelia-public_html.tar.gz authelia-public_html.tar.gz.sha256;
 do
   artifacts+=(-a "${FILES}")