diff --git a/.github/workflows/zitadel-pr.yml b/.github/workflows/zitadel-pr.yml
new file mode 100644
index 0000000000..5ac52fd348
--- /dev/null
+++ b/.github/workflows/zitadel-pr.yml
@@ -0,0 +1,45 @@
+name: ZITADEL PR
+
+on:
+  pull_request:
+
+jobs:
+  Go:
+    runs-on: ubuntu-20.04
+    env:
+      DOCKER_BUILDKIT: 1
+    steps:
+      - name: Source checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          driver: docker
+          install: true
+      - name: Test
+        run: docker build -f build/grpc/Dockerfile -t zitadel-base:local . && docker build -f build/zitadel/Dockerfile . -t zitadel-go-test --target go-codecov -o .artifacts/codecov
+
+  Angular:
+    runs-on: ubuntu-20.04
+    env:
+      DOCKER_BUILDKIT: 1
+    steps:
+      - name: Source checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          driver: docker
+          install: true
+      - name: Test
+        run: docker build -f build/grpc/Dockerfile -t zitadel-base:local . && docker build -f build/console/Dockerfile . -t zitadel-npm-base --target angular-build
+      - name: Publish go coverage
+        uses: codecov/codecov-action@v3.1.0
+        with:
+          file: .artifacts/codecov/profile.cov
+          name: go-codecov
+
diff --git a/.github/workflows/zitadel.yml b/.github/workflows/zitadel.yml
index c181187d68..c63637be98 100644
--- a/.github/workflows/zitadel.yml
+++ b/.github/workflows/zitadel.yml
@@ -1,7 +1,6 @@
 name: ZITADEL Release
 
 on:
-  pull_request:
   push:
     tags-ignore:
       - "*"
@@ -30,8 +29,6 @@ jobs:
         with:
           driver: docker
           install: true
-      - name: Test
-        run: docker build -f build/grpc/Dockerfile -t zitadel-base:local . && docker build -f build/zitadel/Dockerfile . -t zitadel-go-test --target go-codecov -o .artifacts/codecov
       - name: Tag
         id: semantic
         uses: cycjimmy/semantic-release-action@v2
diff --git a/build/console/Dockerfile b/build/console/Dockerfile
index e3bc1d90cc..fd4d2d045e 100644
--- a/build/console/Dockerfile
+++ b/build/console/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=14
+ARG NODE_VERSION=16
 
 #######################
 ## With this step we prepare all node_modules, this helps caching the build