diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..b5c16134db
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,24 @@
+{
+	"name": "zitadel",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "devcontainer",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	"features": {
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "1.20"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "18"
+		},
+		"ghcr.io/guiyomh/features/golangci-lint:0": {},
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+		"ghcr.io/jungaretti/features/make:1": {}
+	},
+	"forwardPorts": [
+		3000,
+		4200,
+		8080
+	],
+	"onCreateCommand": "npm install -g sass@1.64.1"
+}
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000000..c7f273a49e
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.8'
+services:
+  devcontainer:
+    image: mcr.microsoft.com/devcontainers/base:ubuntu
+    volumes:
+      - ../..:/workspaces:cached
+      - /var/run/docker.sock:/var/run/docker.sock
+    network_mode: service:db
+    command: sleep infinity
+
+  db:
+    image: postgres:latest
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
+
+volumes:
+  postgres-data:
diff --git a/.gitignore b/.gitignore
index db17a6ead4..f93505b4b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ migrations/cockroach/migrate_cloud.go
 /.artifacts/*
 !/.artifacts/zitadel
 /zitadel
+node_modules/
 
 go.work
 go.work.sum
diff --git a/internal/notification/statik/generate.go b/internal/notification/statik/generate.go
index 0f9e4ac17a..f840619a94 100644
--- a/internal/notification/statik/generate.go
+++ b/internal/notification/statik/generate.go
@@ -1,3 +1,3 @@
 package statik
 
-//go:generate statik -src=../static -dest=.. -ns=notification
+//go:generate statik -f -src=../static -dest=.. -ns=notification
diff --git a/internal/statik/generate.go b/internal/statik/generate.go
index 96148570c4..e407630ae6 100644
--- a/internal/statik/generate.go
+++ b/internal/statik/generate.go
@@ -1,3 +1,3 @@
 package statik
 
-//go:generate statik -src=../static -dest=.. -ns=zitadel
+//go:generate statik -f -src=../static -dest=.. -ns=zitadel