diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml
new file mode 100644
index 000000000..cb02cc203
--- /dev/null
+++ b/.github/workflows/openapi.yml
@@ -0,0 +1,35 @@
+name: Open API
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - internal/mapper/*/Dockerfile
+
+jobs:
+  code-sync:
+    name: Regenerate OpenAPI client code
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Regenerate OpenAPI client code
+        run: make openapi-client
+
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v3.6.0
+        with:
+          token: ${{ secrets.GH_REPO_TOKEN }}
+          author: "Łukasz Mierzwa <l.mierzwa@gmail.com>"
+          commit-message: "chore(backend): regenerate openapi code"
+          branch: openapi-sync
+          delete-branch: true
+          title: "chore(backend): regenerate openapi code"
+
+      - name: Check outputs
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e05d0fb77..dd3fbe376 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -238,24 +238,6 @@ jobs:
       - name: Check for local changes
         run: git diff --exit-code
 
-  openapi:
-    name: Verify OpenAPI client code
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.15.6
-
-      - name: Generate OpenAPI code
-        run: make openapi-client
-
-      - name: Check for local changes
-        run: git diff --exit-code
-
   deps-js:
     name: Check JS dependencies
     runs-on: ubuntu-latest
@@ -344,7 +326,6 @@ jobs:
       - format-go
       - format-js
       - go-mod-tidy
-      - openapi
       - deps-js
       - lint-versions
       - typescript