diff --git a/.github/workflows/acceptance-public.yml b/.github/workflows/acceptance-public.yml
index 3f82d397dc..30f1a50b8a 100644
--- a/.github/workflows/acceptance-public.yml
+++ b/.github/workflows/acceptance-public.yml
@@ -47,15 +47,6 @@ jobs:
       operator_id: ${{ inputs.operator_id }}
       operator_key: ${{ inputs.operator_key }}
 
-  rpc_api_schema_conformity:
-    name: API Conformity
-    uses: ./.github/workflows/acceptance-workflow.yml
-    with:
-      testfilter: api_conformity
-      envfile: ${{ inputs.network }}Acceptance.env
-      operator_id: ${{ inputs.operator_id }}
-      operator_key: ${{ inputs.operator_key }}
-
   erc20:
     name: ERC20
     uses: ./.github/workflows/acceptance-workflow.yml
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index 01ae2714c5..082cf6e087 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -30,12 +30,6 @@ jobs:
     with:
       testfilter: api_batch3
 
-  rpc_api_schema_conformity:
-    name: API Conformity
-    uses: ./.github/workflows/acceptance-workflow.yml
-    with:
-      testfilter: rpc_api_schema_conformity
-
   erc20:
     name: ERC20
     uses: ./.github/workflows/acceptance-workflow.yml
diff --git a/.github/workflows/conformity-workflow.yml b/.github/workflows/conformity-workflow.yml
new file mode 100644
index 0000000000..20f49af45d
--- /dev/null
+++ b/.github/workflows/conformity-workflow.yml
@@ -0,0 +1,66 @@
+name: Conformity Test Workflow
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  clone-and-build-execution-apis:
+    runs-on: [self-hosted, Linux, medium, ephemeral]
+
+    steps:
+      - name: Checkout execution-apis repo
+        uses: actions/checkout@v2
+        with:
+          repository: 'ethereum/execution-apis'
+          ref: 'main'
+          path: 'execution-apis'
+
+      - name: Use Node.js TLS 18
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: ./execution-apis
+
+      - name: Build project
+        run: npm run build
+        working-directory: ./execution-apis
+
+      - name: Copy openrpc.json to current repo
+        run: cp ./execution-apis/openrpc.json ${{ github.workspace }}
+
+      - name: Commit openrpc.json
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add openrpc.json
+          git commit -m "Update openrpc.json" || echo "No changes to commit"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build-and-test:
+    runs-on: [self-hosted, Linux, medium, ephemeral]
+    needs: clone-and-build-execution-apis
+  
+    steps:
+      - name: Checkout current repo
+        uses: actions/checkout@v2
+
+      - name: Use Node.js TLS 18
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        with:
+          node-version: 18
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run conformity tests
+        run: npm run acceptancetest:rpc_api_schema_conformity
diff --git a/.github/workflows/manual-testing.yml b/.github/workflows/manual-testing.yml
index 8f9ae1ff6c..bdafcf624d 100644
--- a/.github/workflows/manual-testing.yml
+++ b/.github/workflows/manual-testing.yml
@@ -41,15 +41,6 @@ jobs:
       testfilter: api_batch3
       networkTag: ${{inputs.networkNodeTag}}
       mirrorTag: ${{inputs.mirrorNodeTag}}
-
-
-  rpc_api_schema_conformity:
-    name: API Conformity
-    uses: ./.github/workflows/acceptance-workflow.yml
-    with:
-      testfilter: rpc_api_schema_conformity
-      networkTag: ${{inputs.networkNodeTag}}
-      mirrorTag: ${{inputs.mirrorNodeTag}}
       
   erc20:
     name: ERC20