diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000000..219c096336b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+# .dockerignore
+node_modules
+*.log
+*.md
+.gitignore
+Dockerfile
+.env
\ No newline at end of file
diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml
index 0894032c8ad..b12e0f1f83a 100644
--- a/.github/workflows/deploy-beta.yml
+++ b/.github/workflows/deploy-beta.yml
@@ -21,8 +21,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10
 
       - uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e7102a41dd..439f1e7749f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,8 +19,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10
 
       - uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 82f5abd23a1..b6edb11ebe6 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -25,8 +25,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml
index 124004f380f..80fca34bcb2 100644
--- a/.github/workflows/test-shard-template.yml
+++ b/.github/workflows/test-shard-template.yml
@@ -31,8 +31,6 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000000..ddb865b4831
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,47 @@
+# syntax=docker/dockerfile:1
+ARG NODE_VERSION=22.14
+ARG OS=alpine
+
+FROM node:${NODE_VERSION}-${OS}
+
+# Create non-root user
+RUN addgroup -S appgroup && adduser -S appuser -G appgroup
+
+# Install git (for potential runtime needs)
+RUN apk add --no-cache git
+
+# Set working directory
+WORKDIR /app
+
+# Enable and prepare pnpm
+RUN corepack enable && corepack prepare pnpm@10.14.0 --activate
+
+COPY . .
+
+# Copy package files
+COPY package.json pnpm-lock.yaml ./
+
+# Install all dependencies
+RUN --mount=type=cache,target=/home/appuser/.pnpm-store \
+    pnpm install --frozen-lockfile && \
+    rm -rf /home/appuser/.pnpm-store/*
+
+# Change ownership
+RUN chown -R appuser:appgroup /app
+
+# Switch to non-root user
+USER appuser
+
+# Set environment variables
+ENV VITE_BYPASS_LOGIN=1 \
+    VITE_BYPASS_TUTORIAL=0 \
+    NEXT_TELEMETRY_DISABLED=1 \
+    PNP_HOME=/home/appuser/.shrc \
+    NODE_ENV=development \
+    PORT=8000
+
+# Expose port
+EXPOSE $PORT
+
+# Start the app in development mode
+CMD ["pnpm", "run", "start:podman"]
diff --git a/docs/podman.md b/docs/podman.md
new file mode 100644
index 00000000000..80fee3258d1
--- /dev/null
+++ b/docs/podman.md
@@ -0,0 +1,27 @@
+# Using Podman
+
+## Requirements
+
+* `podman >=5.x`
+
+## Steps
+
+1. `podman build -t pokerogue -f Dockerfile .`
+2. `podman create --name temp-pokerogue localhost/pokerogue`
+3. `podman cp temp-pokerogue:/app/node_modules ./`
+4. `podman cp temp-pokerogue:/app/public/locales ./public/`
+5. `podman rm temp-pokerogue`
+6. `podman run --rm -p 8000:8000 -v $(pwd):/app:Z --userns=keep-id -u $(id -u):$(id -g) localhost/pokerogue`
+7. Visit `http://localhost:8000/`
+
+Note: 
+
+1. Steps 2,3,4 are required because mounting working directory without installed `node_modules/` locally will be empty,
+this way we prevent it by copying them from the container itself to local directory
+
+2. `podman run` may take a couple of minutes to mount the working directory
+
+### Running tests inside container
+
+1. `podman run --rm -p 8000:8000 -v $(pwd):/app:Z --userns=keep-id -u $(id -u):$(id -g) localhost/pokerogue2 pnpm test:silent
+`
\ No newline at end of file
diff --git a/package.json b/package.json
index d3ea890c005..b094e12c326 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "start": "vite",
     "start:dev": "vite --mode development",
+    "start:podman": "vite --mode development --host 0.0.0.0 --port $PORT",
     "build": "vite build",
     "build:beta": "vite build --mode beta",
     "preview": "vite preview",
@@ -61,5 +62,6 @@
   },
   "engines": {
     "node": ">=22.0.0"
-  }
+  },
+  "packageManager": "pnpm@10.14.0"
 }