diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index ebb848c..baaf1cf 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -4,7 +4,7 @@ on: [push]
 jobs:
   build:
     name: cppcheck-test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
 
@@ -12,5 +12,7 @@ jobs:
         run: sudo apt-get install cppcheck
 
       - name: Execute linter check with cppcheck
-        run: sudo cppcheck --enable=all --inline-suppr --template='{file}:{line},{severity},{id},{message}' --error-exitcode=1 --suppress=missingIncludeSystem --suppress=missingInclude --check-config .
+        run: |
+          set -x
+          cppcheck --enable=all --inline-suppr --template='{file}:{line},{severity},{id},{message}' --error-exitcode=1 --suppress=missingIncludeSystem --suppress=missingInclude --suppress=unmatchedSuppression:pg_stat_monitor.c --check-config .
 
diff --git a/.github/workflows/pg11test.yml b/.github/workflows/pg11test.yml
index ab8b019..57ea811 100644
--- a/.github/workflows/pg11test.yml
+++ b/.github/workflows/pg11test.yml
@@ -32,7 +32,7 @@ jobs:
           sudo rm -f /usr/bin/pg_config
 
       - name: Create pgsql dir
-        run: sudo mkdir -p /opt/pgsql
+        run: mkdir -p /opt/pgsql
 
       - name: Build postgres
         run: |
diff --git a/.github/workflows/pg12test.yml b/.github/workflows/pg12test.yml
index 1940ac0..1eee4c2 100644
--- a/.github/workflows/pg12test.yml
+++ b/.github/workflows/pg12test.yml
@@ -32,7 +32,7 @@ jobs:
           sudo rm -f /usr/bin/pg_config
 
       - name: Create pgsql dir
-        run: sudo mkdir -p /opt/pgsql
+        run: mkdir -p /opt/pgsql
 
       - name: Build postgres
         run: |
diff --git a/.github/workflows/pg13test.yml b/.github/workflows/pg13test.yml
index 0733e12..dd746fa 100644
--- a/.github/workflows/pg13test.yml
+++ b/.github/workflows/pg13test.yml
@@ -32,7 +32,7 @@ jobs:
           sudo rm -f /usr/bin/pg_config
 
       - name: Create pgsql dir
-        run: sudo mkdir -p /opt/pgsql
+        run: mkdir -p /opt/pgsql
 
       - name: Build postgres
         run: |