diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 37eb8991a9f0..967e33848a55 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -36,23 +36,6 @@ jobs:
         if: ${{ failure() && github.ref == 'ref/head/master' }}
         run: |
           go run cmd/issuegenerator/main.go $TEST_RESULTS
-  check-links:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Node
-        uses: actions/setup-node@v2-beta
-        with:
-          node-version: '9'
-      - name: Check links in markdown docs
-        run: |
-          pushd $HOME
-          npm install --save-dev markdown-link-check@3.8.1
-          popd
-      - run: ./.github/workflows/check-links/check-links.sh
   setup-environment:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
new file mode 100644
index 000000000000..b5a4b3060e17
--- /dev/null
+++ b/.github/workflows/check-links.yaml
@@ -0,0 +1,23 @@
+name: check-links
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+check-links:
+  runs-on: ubuntu-latest
+  steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Setup Node
+      uses: actions/setup-node@v2-beta
+      with:
+        node-version: '9'
+    - name: Check links in markdown docs
+      run: |
+        pushd $HOME
+        npm install --save-dev markdown-link-check@3.8.1
+        popd
+    - run: ./.github/workflows/check-links/check-links.sh