diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 11793c8..fb00ad4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,8 +99,8 @@ jobs:
           fail_on_unmatched_files: true
 
   build-containers-release:
-    needs: release
-    if: startsWith(github.ref, 'refs/tags/')
+    #needs: test
+    #if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -129,6 +129,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      # # Uncomment to use QEMU emulation, if rarer architectures are needed
       # - name: Set up QEMU
       #   uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -137,14 +138,6 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           path: .artifacts
-      # - name: Build and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: .git st
-      #     file: docker/Dockerfile.dist
-      #     platforms: linux/amd64,linux/arm64
-      #     push: true
-      #     tags: ${{ env.REGISTRY_IMAGE }}
 
       - name: Build and push by digest
         id: build
@@ -172,7 +165,7 @@ jobs:
           retention-days: 1
 
   container-manifest-merge:
-    if: startsWith(github.ref, 'refs/tags/')
+    #if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -203,6 +196,8 @@ jobs:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: |
             type=ref,event=tag
+            type=ref,event=pr
+            type=ref,event=push
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e0f1b24..449e58c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,16 @@
-FROM python:3.13-alpine
+FROM python:3.13-alpine AS build
+
+RUN apk add --no-cache build-base linux-headers libffi-dev libressl-dev cargo
 
 ENV PIP_ROOT_USER_ACTION=ignore
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=1
 RUN pip install rns
 
+FROM python:3.13-alpine
+
+COPY --from=build /usr/local/bin/ /usr/local/bin/
+
 RUN mkdir /config
 
 RUN addgroup -S rns --gid 1000 && adduser -S rns --uid 1000 -G rns dialout
diff --git a/docker/Dockerfile.dist b/docker/Dockerfile.dist
deleted file mode 100644
index 38f7526..0000000
--- a/docker/Dockerfile.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM python:3.13-alpine
-
-ADD .artifacts/package/dist/rns-*.whl /tmp/
-
-ENV PIP_ROOT_USER_ACTION=ignore
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-ENV PIP_NO_CACHE_DIR=1
-RUN pip install /tmp/rns-*.whl
-
-RUN mkdir /config
-
-RUN addgroup -S rns --gid 1000 && adduser -S rns --uid 1000 -G rns dialout
-RUN chown rns:rns /config
-
-USER rns:rns
-
-VOLUME ["/config"]
-
-ENV PYTHONUNBUFFERED=1
-
-ENTRYPOINT ["/usr/local/bin/rnsd", "--config", "/config"]
diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release
index ec50403..414732b 100644
--- a/docker/Dockerfile.release
+++ b/docker/Dockerfile.release
@@ -1,11 +1,13 @@
-FROM python:3.13-alpine as build
+FROM python:3.13-alpine AS build
 
 RUN apk add --no-cache build-base linux-headers libffi-dev libressl-dev cargo
 
+ADD .artifacts/package/rns-*.whl /tmp/
+
 ENV PIP_ROOT_USER_ACTION=ignore
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=1
-RUN pip install rns
+RUN pip install /tmp/rns-*.whl
 
 FROM python:3.13-alpine