diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f60e27a..31dbd1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,9 +32,4 @@ jobs:
       - name: Build things
         shell: pwsh
         run: |
-          if ('${{ matrix.architecture }}' -eq 'arm64v8') {
-            sudo apt-get install qemu binfmt-support qemu-user-static
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            sed -i 's/8.0.100-1-alpine3.18/8.0.100-alpine3.18/' Dockerfile
-          }
           docker build . --build-arg ARCH=${{ matrix.architecture }}
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 2bab844..2c756a6 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -78,9 +78,6 @@ jobs:
   create-docker-image:
     runs-on: ubuntu-latest
     needs: [ create-release ]
-    strategy:
-      matrix:
-        architecture: [ amd64, arm64v8 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -94,19 +91,23 @@ jobs:
         shell: pwsh
         run: |
           $version = '${{ github.event.ref }}'.Replace('refs/tags/', '').Replace('v', '')
+          $packageUrl = "ghcr.io/${{ github.actor }}/${{ github.event.repository.name }}".ToLower()
 
-          if ('${{ matrix.architecture }}' -eq 'arm64v8') {
-            sudo apt-get install qemu binfmt-support qemu-user-static
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            sed -i 's/8.0.100-1-alpine3.18/8.0.100-alpine3.18/' Dockerfile
+          $archs = "amd64", "arm64v8"
+          foreach ($arch in $archs) {
+            docker build -t "$($packageUrl):latest-$($arch)" --build-arg ARCH=$($arch) .
+            docker tag "$($packageUrl):latest-$($arch)" "$($packageUrl):$($version)-$($arch)"
+            docker push "$($packageUrl):latest-$($arch)"
+            docker push "$($packageUrl):$($version)-$($arch)"
           }
 
-          docker build . -t ghcr.io/g3rv4/getmoarfediverse:latest-${{ matrix.architecture }} --build-arg ARCH=${{ matrix.architecture }}
-          docker tag ghcr.io/g3rv4/getmoarfediverse:latest-${{ matrix.architecture }} ghcr.io/g3rv4/getmoarfediverse:$version-${{ matrix.architecture }}
-          docker push ghcr.io/g3rv4/getmoarfediverse:latest-${{ matrix.architecture }}
-          docker push ghcr.io/g3rv4/getmoarfediverse:$version-${{ matrix.architecture }}
-
-          if ('${{ matrix.architecture }}' -eq 'amd64') {
-            docker tag ghcr.io/g3rv4/getmoarfediverse:latest-${{ matrix.architecture }} ghcr.io/g3rv4/getmoarfediverse:latest
-            docker push ghcr.io/g3rv4/getmoarfediverse:latest
-          }
+          docker manifest create `
+                "$($packageUrl):latest" `
+                --amend "$($packageUrl):latest-amd64" `
+                --amend "$($packageUrl):latest-arm64v8"
+          docker manifest create `
+                "$($packageUrl):$($version)" `
+                --amend "$($packageUrl):$($version)-amd64" `
+                --amend "$($packageUrl):$($version)-arm64v8"
+          docker manifest push "$($packageUrl):latest"
+          docker manifest push "$($packageUrl):$($version)"
diff --git a/Dockerfile b/Dockerfile
index 654706c..4c9002f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,11 @@
-# syntax=docker/dockerfile:1
-
 ARG ARCH=
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-1-alpine3.18-${ARCH} AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-1-alpine3.18 AS builder
 WORKDIR /src
 COPY src /src/
-RUN dotnet restore /src/GetMoarFediverse.csproj --disable-parallel
-RUN dotnet publish -c Release /src/GetMoarFediverse.csproj -o /app --no-restore
+RUN dotnet publish -c Release /src/GetMoarFediverse.csproj -o /app
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-alpine3.18-${ARCH}  
-VOLUME ["/data"]
+WORKDIR /app
 ENV CONFIG_PATH=/data/config.json
 COPY --from=builder /app /app
-CMD ["/app/GetMoarFediverse"]
+CMD /usr/bin/dotnet GetMoarFediverse.dll