diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4fbff16
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+node_modules
+dist
+.git
+backlog
+docs
+*.md
diff --git a/Dockerfile b/Dockerfile
index ced10fd..647c265 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,15 @@ FROM oven/bun:1 AS build
 WORKDIR /app
 
 # Copy package files
-COPY rspace-online/package.json rspace-online/bun.lockb* ./
+COPY package.json bun.lock* ./
 
 # Copy local SDK dependency (package.json references file:../encryptid-sdk)
-COPY encryptid-sdk /encryptid-sdk/
+COPY --from=encryptid-sdk . /encryptid-sdk/
 
 RUN bun install --frozen-lockfile
 
 # Copy source
-COPY rspace-online/ .
+COPY . .
 
 # Build frontend
 RUN bun run build
diff --git a/docker-compose.yml b/docker-compose.yml
index a4eddc3..94d4aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
 services:
   rspace:
     build:
-      context: ..
-      dockerfile: rspace-online/Dockerfile
+      context: .
+      additional_contexts:
+        encryptid-sdk: ../encryptid-sdk
     container_name: rspace-online
     restart: unless-stopped
     volumes: