diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b2452e0f..2d1f9691 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -11,17 +11,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_version: ["1.15", "1.16", "latest"]
+        go_version: ["1.19", "latest"]
         db_versions:
-          - mysql_version: 5
-            postgres_version: 9.6
-            sqlserver_version: "2017-CU8-ubuntu"
-          - mysql_version: 5
-            postgres_version: "10.10"
-            sqlserver_version: "2017-CU8-ubuntu"
+          - mysql_version: 5.7
+            postgres_version: 9
+            sqlserver_version: "2017-latest"
+          - mysql_version: "8.0"
+            postgres_version: 10
+            sqlserver_version: "2019-latest"
           - mysql_version: 8
-            postgres_version: 11.5
-            sqlserver_version: "2017-CU8-ubuntu"
+            postgres_version: 11
+            sqlserver_version: "2022-latest"
+          - mysql_version: 8
+            postgres_version: 15
+            sqlserver_version: "2022-latest"
     env:
       GO_VERSION: ${{ matrix.go_version }}
       MYSQL_VERSION: ${{ matrix.db_versions.mysql_version }}
@@ -29,7 +32,7 @@ jobs:
       SQLSERVER_VERSION: ${{ matrix.db_versions.sqlserver_version }}
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Test
       run: docker-compose run goqu-coverage
     - name: Upload coverage to Codecov
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index e2593b51..f3662f09 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -12,9 +12,13 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+          cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v1.39.0
@@ -35,4 +39,4 @@ jobs:
           # skip-pkg-cache: true
 
           # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true
\ No newline at end of file
+          # skip-build-cache: true
diff --git a/docker-compose.yml b/docker-compose.yml
index 3dd0c57d..a869acc0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
 
   goqu:
     image: "golang:${GO_VERSION}"
-    command: ["./wait-for-it.sh", "postgres:5432", "--", "./wait-for-it.sh", "mysql:3306", "--", "go test -v -race ./..."]
+    command: ["./wait-for-it.sh", "postgres:5432", "--", "./wait-for-it.sh", "mysql:3306", "--", "./wait-for-it.sh", "sqlserver:1433", "--", "./go.test.sh"]
     working_dir: /go/src/github.com/doug-martin/goqu
     volumes:
       - "./:/go/src/github.com/doug-martin/goqu"
@@ -48,7 +48,7 @@ services:
       - sqlserver
   goqu-coverage:
     image: "golang:${GO_VERSION}"
-    command: ["./wait-for-it.sh", "postgres:5432", "--", "./wait-for-it.sh", "mysql:3306", "--", "./go.test.sh"]
+    command: ["./wait-for-it.sh", "postgres:5432", "--", "./wait-for-it.sh", "mysql:3306", "--", "./wait-for-it.sh", "sqlserver:1433", "--", "./go.coverage.sh"]
     working_dir: /go/src/github.com/doug-martin/goqu
     volumes:
       - "./:/go/src/github.com/doug-martin/goqu"
diff --git a/go.coverage.sh b/go.coverage.sh
new file mode 100644
index 00000000..68bc2eaa
--- /dev/null
+++ b/go.coverage.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+echo "" > coverage.txt
+
+go test -coverprofile=coverage.txt -coverpkg=./... ./...
diff --git a/go.test.sh b/go.test.sh
index 4d7be372..3749ef87 100755
--- a/go.test.sh
+++ b/go.test.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
 set -e
-echo "" > coverage.txt
 
-go test -race -coverprofile=coverage.txt -coverpkg=./... ./...
\ No newline at end of file
+go test -v -race ./...