diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 838b05be4..d79aa2977 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,8 @@ jobs:
   test:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-    container: node:22-alpine
+    runs-on: ubuntu-22.04
+    container: node:18.18.2-alpine
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/Dockerfile b/Dockerfile
index 9bb6853b9..57011ca54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM node:22.20.0-alpine3.22@sha256:096829fd4bb8c2ce2340ed64dd2f857951f8704325f7acf53e3dc0561c36a214 AS build_image
+FROM node:18.18.2-alpine AS BUILD_IMAGE
+
+WORKDIR /app
 
 ARG SOURCE_DATE_EPOCH
 ARG TARGETPLATFORM
@@ -35,9 +37,12 @@ RUN pnpm prune --prod --ignore-scripts && \
 
 FROM node:22.20.0-alpine3.22@sha256:096829fd4bb8c2ce2340ed64dd2f857951f8704325f7acf53e3dc0561c36a214
 
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+RUN touch config/DOCKER
+
+RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
+
+
+FROM node:18.18.2-alpine
 
 WORKDIR /app
 
diff --git a/Dockerfile.local b/Dockerfile.local
index 1cefe8f29..f487b9c7d 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,8 +1,4 @@
-FROM node:22.20.0-alpine3.22@sha256:096829fd4bb8c2ce2340ed64dd2f857951f8704325f7acf53e3dc0561c36a214
-
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+FROM node:18.18.2-alpine
 
 COPY . /app
 WORKDIR /app