diff --git a/Cargo.lock b/Cargo.lock
index 074ba3d9..0620491c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4370,7 +4370,7 @@ dependencies = [
 
 [[package]]
 name = "policy-server"
-version = "1.20.0"
+version = "1.21.0-rc1"
 dependencies = [
  "anyhow",
  "axum 0.8.2",
diff --git a/Cargo.toml b/Cargo.toml
index ec069b29..6a6bd9f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "policy-server"
-version = "1.20.0"
+version = "1.21.0-rc1"
 authors = [
   "Kubewarden Developers <kubewarden@suse.de>",
   "Flavio Castelli <fcastelli@suse.com>",
diff --git a/Dockerfile b/Dockerfile
index 0602f18d..ed4b3200 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ COPY ./ ./
 RUN cargo install cargo-auditable
 RUN cargo auditable install --target x86_64-unknown-linux-musl --path .
 
-FROM --platform=$BUILDPLATFORM alpine AS cfg
+FROM --platform=$BUILDPLATFORM alpine:3.21.2 AS cfg
 RUN echo "policy-server:x:65533:65533::/tmp:/sbin/nologin" >> /etc/passwd
 RUN echo "policy-server:x:65533:policy-server" >> /etc/group
 
@@ -48,7 +48,7 @@ COPY --from=build-arm64 --chmod=0755 /root/.cargo/bin/policy-server /policy-serv
 FROM copy-${TARGETARCH}
 COPY --from=cfg /etc/passwd /etc/passwd
 COPY --from=cfg /etc/group /etc/group
-ADD Cargo.lock /Cargo.lock
+COPY ./Cargo.lock /Cargo.lock
 USER 65533:65533
 EXPOSE 3000
 ENTRYPOINT ["/policy-server"]