diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 1a97a852d..653cb930b 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go 1.18
       uses: actions/setup-go@v3
       with:
-        go-version: '>=1.18.2'
+        go-version: '>=1.18.2 <1.19'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
     - name: Set up Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.2
+        go-version: '>=1.18.2 <1.19'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
@@ -52,7 +52,7 @@ jobs:
     - name: Set up Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.2
+        go-version: '>=1.18.2 <1.19'
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
     - name: golangci-lint
@@ -69,7 +69,7 @@ jobs:
     - name: Set up Go 1.18
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.2
+        go-version: '>=1.18.2 <1.19'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
diff --git a/.golangci.yml b/.golangci.yml
index 5ce3c85c4..7a9e6b3aa 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,6 @@
 # Tested with golangci-lint ver. 1.37
 run:
-  timeout: 3m
+  timeout: 10m
   skip-dirs:
     - vendor/
     - .github/