diff --git a/Dockerfile b/Dockerfile
index 41eb4db..79dfaed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN go build -o /usr/bin/knot -ldflags '-s -w -extldflags "-static"' ./cmd/knot
 FROM builder AS build-spindle
 RUN go build -o /usr/bin/spindle -ldflags '-s -w -extldflags "-static"' ./cmd/spindle
 
-FROM alpine:edge AS knot
+FROM alpine:latest AS knot
 EXPOSE 5555
 EXPOSE 22
 
@@ -44,7 +44,7 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=5s --retries=3 \
 
 ENTRYPOINT ["/init"]
 
-FROM alpine:edge AS spindle
+FROM alpine:latest AS spindle
 
 EXPOSE 6555
 
diff --git a/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys b/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys
index e435536..c5db725 100755
--- a/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys
+++ b/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys
@@ -12,10 +12,10 @@ foreground {
 
 foreground {
   if -n { test -f /etc/ssh/keys/ssh_host_ecdsa_key }
-  ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ecdsa_key -q -N ""
+  ssh-keygen -t ecdsa -f /etc/ssh/keys/ssh_host_ecdsa_key -q -N ""
 }
 
 foreground {
   if -n { test -f /etc/ssh/keys/ssh_host_ed25519_key }
-  ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ed25519_key -q -N ""
+  ssh-keygen -t ed25519 -f /etc/ssh/keys/ssh_host_ed25519_key -q -N ""
 }