diff --git a/.github/workflows/postgresql-14-build.yml b/.github/workflows/postgresql-14-build.yml
index 2dc78f5..b5c56ba 100644
--- a/.github/workflows/postgresql-14-build.yml
+++ b/.github/workflows/postgresql-14-build.yml
@@ -83,12 +83,13 @@ jobs:
           sudo make USE_PGXS=1 install
         working-directory: src/pg_stat_monitor
 
-      - name: Load pg_stat_monitor library and Restart Server
+      - name: Configure and Restart Server
         run: |
           export PATH="/usr/lib/postgresql/14/bin:$PATH"
           pg_ctl -D /opt/pgsql/data -l logfile stop
           echo "shared_preload_libraries = 'pg_stat_monitor'" >> \
             /opt/pgsql/data/postgresql.conf
+          echo "compute_query_id = regress" >> /opt/pgsql/data/postgresql.conf
           pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor
 
@@ -126,12 +127,7 @@ jobs:
           retention-days: 3
 
       - name: Start Server installcheck-world tests
-        run: |
-          export PATH="/usr/lib/postgresql/14/bin:$PATH"
-          pg_ctl -D /opt/pgsql/data -l logfile stop
-          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
-          pg_ctl -D /opt/pgsql/data -l logfile start
-          make installcheck-world
+        run: make installcheck-world
 
       - name: Report on installcheck-world test suites fail
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/postgresql-15-build.yml b/.github/workflows/postgresql-15-build.yml
index 08a7270..1fd4a93 100644
--- a/.github/workflows/postgresql-15-build.yml
+++ b/.github/workflows/postgresql-15-build.yml
@@ -83,12 +83,13 @@ jobs:
           sudo make USE_PGXS=1 install
         working-directory: src/pg_stat_monitor
 
-      - name: Load pg_stat_monitor library and Restart Server
+      - name: Configure and Restart Server
         run: |
           export PATH="/usr/lib/postgresql/15/bin:$PATH"
           pg_ctl -D /opt/pgsql/data -l logfile stop
           echo "shared_preload_libraries = 'pg_stat_monitor'" >> \
             /opt/pgsql/data/postgresql.conf
+          echo "compute_query_id = regress" >> /opt/pgsql/data/postgresql.conf
           pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor
 
@@ -126,12 +127,7 @@ jobs:
           retention-days: 3
 
       - name: Start Server installcheck-world tests
-        run: |
-          export PATH="/usr/lib/postgresql/15/bin:$PATH"
-          pg_ctl -D /opt/pgsql/data -l logfile stop
-          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
-          pg_ctl -D /opt/pgsql/data -l logfile start
-          make installcheck-world
+        run: make installcheck-world
 
       - name: Report on installcheck-world test suites fail
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/postgresql-16-build.yml b/.github/workflows/postgresql-16-build.yml
index d94282a..98fa051 100644
--- a/.github/workflows/postgresql-16-build.yml
+++ b/.github/workflows/postgresql-16-build.yml
@@ -83,12 +83,13 @@ jobs:
           sudo make USE_PGXS=1 install
         working-directory: src/pg_stat_monitor
 
-      - name: Load pg_stat_monitor library and Restart Server
+      - name: Configure and Restart Server
         run: |
           export PATH="/usr/lib/postgresql/16/bin:$PATH"
           pg_ctl -D /opt/pgsql/data -l logfile stop
           echo "shared_preload_libraries = 'pg_stat_monitor'" >> \
             /opt/pgsql/data/postgresql.conf
+          echo "compute_query_id = regress" >> /opt/pgsql/data/postgresql.conf
           pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor
 
@@ -126,12 +127,7 @@ jobs:
           retention-days: 3
 
       - name: Start Server installcheck-world tests
-        run: |
-          export PATH="/usr/lib/postgresql/16/bin:$PATH"
-          pg_ctl -D /opt/pgsql/data -l logfile stop
-          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
-          pg_ctl -D /opt/pgsql/data -l logfile start
-          make installcheck-world
+        run: make installcheck-world
 
       - name: Report on installcheck-world test suites fail
         uses: actions/upload-artifact@v2