diff --git a/.github/workflows/commit-test.yml b/.github/workflows/commit-test.yml
new file mode 100644
index 0000000..28a8c67
--- /dev/null
+++ b/.github/workflows/commit-test.yml
@@ -0,0 +1,73 @@
+name: Test initdb commit && PR
+
+on:
+  pull_request:
+    paths:
+      - 'initdb/**'
+    branches:
+      - 'main'
+  push:
+    branches:
+      - 'main'
+  workflow_dispatch:
+
+jobs:
+  ci-test:
+    runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.filter.outputs.workflows }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      # https://github.com/docker/setup-buildx-action
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      # https://github.com/marketplace/actions/build-and-push-docker-images
+      -
+        name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: false
+          tags: xbgmsharp/timescaledb-postgis-gh:latest
+      -
+        name: Run smoke test
+        run: |
+          set -eu
+          export PGHOST=localhost
+          export PGUSER=postgres
+          export PGPASSWORD=test1234
+          docker container stop smoketest-image || true
+          docker container rm smoketest-image || true
+          docker run -d -p 5432:5432 -e POSTGRES_PASSWORD=${PGPASSWORD} --name smoketest-image xbgmsharp/timescaledb-postgis-gh
+          for _ in {1..120}
+          do
+            if [ -z "$(docker container ls -q --filter name=smoketest-image)" ]
+            then
+              echo "Smoketest container is not running"
+              exit 1
+            fi
+            if psql -c "select 1"
+            then
+              echo "Test PostgreSQL"
+              psql -c "SELECT version();"
+              bash tests/extensions_test/test*.sh
+              break
+            fi
+            sleep 1
+          done
+          if ! psql -c "select 1"
+          then
+            echo "Cannot connect to PostgreSQL"
+            exit 1
+          fi
+
+      - name: Show the logs
+        if: always()
+        run: |
+          docker logs smoketest-image
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/postgsail-db-tests.yml
similarity index 77%
rename from .github/workflows/test.yml
rename to .github/workflows/postgsail-db-tests.yml
index 5ac417e..f19e6f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/postgsail-db-tests.yml
@@ -1,15 +1,17 @@
-name: Test PostgSail docker & schema
+name: PostgSail DB Tests docker & schema
 
 on:
   push:
     branches:
       - 'main'
+    paths:
+      - 'initdb/**'
     # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
   smoketest:
-    name: smoketest
+    name: tests
     runs-on: ubuntu-latest
     steps:
       - name: Check out the source
@@ -43,9 +45,12 @@ jobs:
           echo ${PGSAIL_API_URL}
           curl ${PGSAIL_API_URL}
           psql -c "select 1"
-          echo "Test PostgreSQL"
+          echo "Test PostgreSQL version"
           psql -c "SELECT version();"
-          psql -c "SELECT value is not null FROM app_settings WHERE name = 'app.version';"
+          echo "Test PostgSail version"
+          psql -c "SELECT value FROM app_settings WHERE name = 'app.version';"
+          echo "Test PostgSail Unit Test"
+          docker-compose -f docker-compose.dev.yml -f docker-compose.yml up tests
       - name: Show the logs
         if: always()
         run: |