diff --git a/Dockerfile b/Dockerfile
index 80ad0a86..5c2b8b9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:12-slim AS builder
+FROM ubuntu:24.04 AS builder
 
 ARG AWS_ACCESS_KEY_ID
 ARG AWS_SECRET_ACCESS_KEY
@@ -40,7 +40,7 @@ RUN if [ -n "$AWS_ACCESS_KEY_ID" ]; then \
         ./sccache --show-stats; \
     fi
 
-FROM debian:12-slim
+FROM ubuntu:24.04
 
 RUN apt update && apt install -y zlib1g && \
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..9fdafb80
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,23 @@
+services:
+  subspace-node:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ./node/chain-specs/main.json:/app/chain_spec.json:ro
+      - node-data:/data
+      - ./target/release:/app/target/release
+    ports:
+      - "30333:30333"  # P2P port
+      - "9933:9933"    # RPC port
+      - "9944:9944"    # WebSocket port
+    command: 
+      - /app/target/release/node-subspace
+      - --chain 
+      - /app/chain_spec.json
+      - --base-path
+      - /app/node-data
+    restart: unless-stopped
+
+volumes:
+  node-data: