diff --git a/Dockerfile b/Dockerfile
index 155bacf..13daf90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,21 @@
-FROM node:18-alpine AS base
+FROM node:22-alpine AS base
 
 # Install dependencies only when needed
 FROM base AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
-
 # Install dependencies based on the preferred package manager
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
-RUN \
-  if [ -f yarn.lock ]; then yarn --immutable; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
+COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* \node_modules ./
+RUN corepack enable
+RUN if [ -f yarn.lock ]; then yarn; fi
+RUN ls -la
 
 
 # Rebuild the source code only when needed
 FROM base AS builder
 WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
+COPY --from=deps ./node_modules ./node_modules
 COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
diff --git a/app/tag-data.json b/app/tag-data.json
index 13e19e5..f896716 100644
--- a/app/tag-data.json
+++ b/app/tag-data.json
@@ -1 +1,5 @@
-{"cygnus":1,"self-hosted":1,"server":1}
\ No newline at end of file
+<<<<<<< HEAD
+{"cygnus":1,"self-hosted":1,"server":1}
+=======
+{"next-js":3,"tailwind":2,"guide":4,"feature":1,"yoyoyoy":1,"github":1,"writings":1,"book":1,"reflection":1,"markdown":1,"code":1,"features":1}
+>>>>>>> 51e22599dd61ce72b15ba79601cfaa60af0167be