diff --git a/Dockerfile b/Dockerfile
index fd4dead..13b4d8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
 # Stage 1: Build the Next.js frontend
-FROM docker.io/library/node:25-alpine AS frontend-builder
+FROM docker.io/library/node:25 AS frontend-builder
 LABEL authors="lucasoskorep"
 
 WORKDIR /build/mta-sign-ui
 
-# Enable corepack for pnpm
-RUN corepack enable && corepack prepare pnpm@10.28.1 --activate
-
 # Copy package files first for better caching
 COPY mta-sign-ui/package.json mta-sign-ui/pnpm-lock.yaml* ./
 
-# Install dependencies (use frozen-lockfile if lock exists, otherwise generate)
-RUN pnpm install
+# Enable corepack and install pnpm from packageManager field
+RUN npm install -g pnpm
 
 # Copy the rest of the frontend source
 COPY mta-sign-ui/ ./
diff --git a/justfile b/justfile
index 2689cc1..9070491 100644
--- a/justfile
+++ b/justfile
@@ -65,9 +65,9 @@ build-ui:
 
 # Build multi-arch container image
 containers:
-    podman build --platform linux/arm64,linux/amd64 -f docker/Dockerfile --manifest chaos2theory/pi-mta-sign:test .
+    podman build --platform linux/arm64,linux/amd64 -f Dockerfile --manifest chaos2theory/pi-mta-sign:test .
     podman manifest push --all chaos2theory/pi-mta-sign:test
-    podman manifest rm chaos2theory/pi-mta-sign:test
+    podman manifest rm chaos2theory/pi-mta-sign:testpod
 
 # Build container image (local arch only)
 build-container:
diff --git a/mta-sign-ui/.nvmrc b/mta-sign-ui/.nvmrc
deleted file mode 100644
index cabf43b..0000000
--- a/mta-sign-ui/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-24
\ No newline at end of file