diff --git a/Dockerfile b/Dockerfile
index ddba090..0ba9797 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build environment to install emerge and perform updates
-FROM alpine:3.21 AS builder
+FROM alpine:edge AS builder
 
 ARG TARGETPLATFORM
 
@@ -10,11 +10,9 @@ ENV HOME=/home/root
 
 # Stable repos first, edge as fallback for packages not yet in stable
 RUN ALPINE_VERSION=$(cut -d '.' -f1,2 /etc/alpine-release) && \
-    echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" > /etc/apk/repositories && \
-    echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community" >> /etc/apk/repositories && \
-    echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
-    echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
-    echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+    echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
+    echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
+    echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 
 # Update package list
 RUN apk update && apk upgrade
@@ -55,7 +53,6 @@ RUN apk add --no-cache \
     direnv \
     yq \
     fd \
-    thefuck@edge \
     delta \
   # Languages \
     go \
@@ -68,7 +65,7 @@ RUN apk add --no-cache \
     npm \
   # Miscellaneous tools \
     jq \
-    neofetch@edge \
+    neofetch \
     tmux \
     vim \
   # Shells and Zsh plugins \
@@ -78,9 +75,9 @@ RUN apk add --no-cache \
     zsh-completions \
   # K8s tools \
     kubectl \
-    helm@edge \
-    helm-ls@edge \
-    helmfile@edge \
+    helm \
+    helm-ls \
+    helmfile \
     k9s \
   && rm -rf /var/cache/apk/*
 
@@ -126,6 +123,7 @@ RUN apk --no-cache --virtual .build-deps add \
       uv tool install --verbose pyright && \
       uv tool install --verbose ruff-lsp && \
       uv tool install --verbose just && \
+      uv tool install --verbose thefuck && \
       uv tool install --verbose ansible
 
 # npm installs