diff --git a/Makefile b/Makefile
index 7aa1a927b1..714d447828 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ docker_image:
 
 .PHONY: compile_pipeline
 compile_pipeline: console_move
-	CGO_ENABLED=0 go build -o zitadel -v -ldflags="-s -w -X 'github.com/zitadel/zitadel/cmd/build.commit=$(COMMIT_SHA)' -X 'github.com/zitadel/zitadel/cmd/build.date=$(now)' -X 'github.com/zitadel/zitadel/cmd/build.version=$(VERSION)' "
+	CGO_ENABLED=0 go build -o apps/api/zitadel -v -ldflags="-s -w -X 'github.com/zitadel/zitadel/cmd/build.commit=$(COMMIT_SHA)' -X 'github.com/zitadel/zitadel/cmd/build.date=$(now)' -X 'github.com/zitadel/zitadel/cmd/build.version=$(VERSION)' "
 	chmod +x zitadel
 
 .PHONY: core_dependencies
diff --git a/Dockerfile b/apps/api/Dockerfile
similarity index 94%
rename from Dockerfile
rename to apps/api/Dockerfile
index a76248d4c0..87a6eb721a 100644
--- a/Dockerfile
+++ b/apps/api/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:latest AS artifact
 ENV ZITADEL_ARGS=
-ARG TARGETPLATFORM
 
 RUN apt-get update && apt-get install ca-certificates -y
 
@@ -20,7 +19,6 @@ USER zitadel
 ENTRYPOINT ["/app/entrypoint.sh"]
 
 FROM scratch AS final
-ARG TARGETPLATFORM
 
 COPY --from=artifact /etc/passwd /etc/passwd
 COPY --from=artifact /etc/ssl/certs /etc/ssl/certs
diff --git a/entrypoint.sh b/apps/api/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to apps/api/entrypoint.sh
diff --git a/apps/api/project.json b/apps/api/project.json
new file mode 100644
index 0000000000..c7030a5403
--- /dev/null
+++ b/apps/api/project.json
@@ -0,0 +1,41 @@
+{
+    "name": "@zitadel/api",
+    "$schema": "node_modules/nx/schemas/project-schema.json",
+    "sourceRoot": ".",
+    "projectType": "application",
+    "release": {
+        "docker": {
+            "repositoryName": "zitadel/api"
+        }
+    },
+    "targets": {
+        "build": {
+            "command": "make compile",
+            "options": {
+                "command": "make compile"
+            },
+            "outputs": [
+                "{workspaceRoot}/apps/api/zitadel"
+            ],
+            "dependsOn": [
+                "@zitadel/console:build"
+            ]
+        },
+        "docker:build": {
+            "dependsOn": [
+                "build"
+            ],
+            "images": [
+                "zitadel/zitadel:latest"
+            ]
+        },
+        "docker:run": {
+            "options": {
+                "args": [
+                    "-p",
+                    "3000:3000"
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/console/package.json b/apps/console/package.json
index 807d7ba1d0..ba40c4bc2c 100644
--- a/apps/console/package.json
+++ b/apps/console/package.json
@@ -12,40 +12,6 @@
     "lint:fix": "prettier --write src",
     "generate": "pnpm exec buf generate ../../proto --include-imports --include-wkt",
     "clean": "rm -rf dist .angular node_modules src/app/proto/generated"
-  },
-  "nx": {
-    "release": {
-      "docker": {
-        "repositoryName": "zitadel/console"
-      }
-    },
-    "targets": {
-      "generate": {
-        "outputs": [
-          "{projectRoot}/src/app/proto/generated/**"
-        ]
-      },
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist/**"
-        ],
-        "dependsOn": [
-          "generate",
-          "@zitadel/client:build"
-        ]
-      },
-      "docker:build": {
-        "dependsOn": ["build"]
-      },
-      "docker:run": {
-        "options": {
-          "args": [
-            "-p",
-            "3001:3001"
-          ]
-        }
-      }
-    }
   },
     "dependencies": {
     "@angular/animations": "^16.2.12",
diff --git a/apps/console/project.json b/apps/console/project.json
new file mode 100644
index 0000000000..5808f3f5e5
--- /dev/null
+++ b/apps/console/project.json
@@ -0,0 +1,46 @@
+{
+  "name": "@zitadel/console",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/console",
+  "projectType": "application",
+  "release": {
+    "docker": {
+      "repositoryName": "zitadel/console"
+    }
+  },
+  "targets": {
+    "generate": {
+      "outputs": [
+        "{projectRoot}/src/app/proto/generated/**"
+      ]
+    },
+    "build": {
+      "outputs": [
+        "{projectRoot}/dist/**"
+      ],
+      "dependsOn": [
+        "generate",
+        "@zitadel/client:build"
+      ]
+    },
+    "docker:build": {
+      "dependsOn": [
+        "build"
+      ],
+      "options": {
+        "push": false,
+        "tags": [
+          "zitadel/console:latest"
+        ]
+      }
+    },
+    "docker:run": {
+      "options": {
+        "args": [
+          "-p",
+          "3001:3001"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/apps/login/package.json b/apps/login/package.json
index ec9c4f373a..0d084781a2 100644
--- a/apps/login/package.json
+++ b/apps/login/package.json
@@ -21,59 +21,6 @@
     "test:acceptance:setup": "cd ../.. && make login_test_acceptance_setup_env && NODE_ENV=test turbo run test:acceptance:setup:dev",
     "test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev"
   },
-  "nx": {
-    "release": {
-      "docker": {
-        "repositoryName": "zitadel/login"
-      }
-    },
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist/**"
-        ],
-        "dependsOn": [
-          "@zitadel/client:build"
-        ]
-      },
-      "build:login:standalone": {
-        "outputs": [
-          "{projectRoot}/dist/**"
-        ],
-        "dependsOn": [
-          "@zitadel/client#build"
-        ]
-      },
-      "dev": {
-        "dependsOn": [
-          "@zitadel/client#build"
-        ]
-      },
-      "test": {
-        "dependsOn": [
-          "@zitadel/client#build"
-        ]
-      },
-      "test:unit": {
-        "dependsOn": [
-          "@zitadel/client#build"
-        ]
-      },
-      "docker:build": {
-        "dependsOn": [
-          "build:login:standalone"
-        ]
-      },
-      "docker:run": {
-        "options": {
-          "args": [
-            "-p",
-            "3002:3002"
-          ]
-        }
-      }
-    }
-  },
   "git": {
     "pre-commit": "lint-staged"
   },
diff --git a/apps/login/project.json b/apps/login/project.json
new file mode 100644
index 0000000000..5fba5369ce
--- /dev/null
+++ b/apps/login/project.json
@@ -0,0 +1,63 @@
+{
+  "name": "@zitadel/login",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/login",
+  "projectType": "application",
+  "release": {
+    "docker": {
+      "repositoryName": "zitadel/login"
+    }
+  },
+  "targets": {
+    "build": {
+      "outputs": [
+        "{projectRoot}/dist/**"
+      ],
+      "dependsOn": [
+        "@zitadel/client:build"
+      ]
+    },
+    "build:login:standalone": {
+      "outputs": [
+        "{projectRoot}/dist/**"
+      ],
+      "dependsOn": [
+        "@zitadel/client#build"
+      ]
+    },
+    "dev": {
+      "dependsOn": [
+        "@zitadel/client#build"
+      ]
+    },
+    "test": {
+      "dependsOn": [
+        "@zitadel/client#build"
+      ]
+    },
+    "test:unit": {
+      "dependsOn": [
+        "@zitadel/client#build"
+      ]
+    },
+    "docker:build": {
+      "dependsOn": [
+        "build:login:standalone"
+      ],
+      "options": {
+        "push": false,
+        "tags": [
+          "zitadel/login:latest"
+        ]
+      }
+    },
+    "docker:run": {
+      "options": {
+        "args": [
+          "-p",
+          "3002:3002"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/hodor/package.json b/hodor/package.json
deleted file mode 100644
index d6a8b8d016..0000000000
--- a/hodor/package.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "packageManager": "pnpm@9.1.2+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7",
-  "private": true,
-  "name": "@zitadel/api",
-  "scripts": {
-    "build": "make compile"
-  },
-  "nx": {
-    "release": {
-      "docker": {
-        "repositoryName": "zitadel/zitadel"
-      }
-    },
-    "targets": {
-      "build": {
-        "outputs": [
-          "{workspaceRoot}/zitadel"
-        ],
-        "dependsOn": [
-          "@zitadel/console:build"
-        ]
-      },
-      "docker:build": {
-        "dependsOn": [
-          "build"
-        ]
-      },
-      "docker:run": {
-        "options": {
-          "args": [
-            "-p",
-            "3000:3000"
-          ]
-        }
-      }
-    }
-  },
-  "pnpm": {
-    "overrides": {
-      "@typescript-eslint/parser": "^8.35.1",
-      "@zitadel/client": "workspace:*",
-      "@zitadel/proto": "workspace:*"
-    }
-  },
-  "devDependencies": {
-    "@bufbuild/buf": "^1.55.1",
-    "@changesets/cli": "^2.29.5",
-    "@devcontainers/cli": "^0.80.0",
-    "@nx/docker": "21.4.0-beta.5",
-    "nx": "21.4.0-beta.5",
-    "sass": "1.64.1"
-  }
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d023841894..07f3938eb5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -591,27 +591,6 @@ importers:
         specifier: ^13.13.3
         version: 13.17.0
 
-  hodor:
-    devDependencies:
-      '@bufbuild/buf':
-        specifier: ^1.55.1
-        version: 1.55.1
-      '@changesets/cli':
-        specifier: ^2.29.5
-        version: 2.29.5
-      '@devcontainers/cli':
-        specifier: ^0.80.0
-        version: 0.80.0
-      '@nx/docker':
-        specifier: 21.4.0-beta.5
-        version: 21.4.0-beta.5(nx@21.4.0-beta.5(@swc/core@1.13.3))
-      nx:
-        specifier: 21.4.0-beta.5
-        version: 21.4.0-beta.5(@swc/core@1.13.3)
-      sass:
-        specifier: 1.64.1
-        version: 1.64.1
-
   packages/zitadel-client:
     dependencies:
       '@bufbuild/protobuf':
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 31417c906f..58f1cc709e 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,4 +3,3 @@ packages:
   - "e2e"
   - "packages/*"
   - "apps/*"
-  - "hodor"