diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d82d4a9158..e361d64acc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,7 +56,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ${{ fromJSON(needs.config.outputs.go_versions)[0] }}
+        go:
+          - ${{ fromJSON(needs.config.outputs.go_versions)[0] }}
     steps:
       - uses: actions/setup-go@v2
         with:
diff --git a/Dockerfile b/Dockerfile
index 26fbc37c92..8c8efb4fe6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.18
 FROM quay.io/projectquay/golang:${GO_VERSION} AS build
 WORKDIR /build/
 ADD . /build/
 ARG CLAIR_VERSION=dev
 RUN go build \
-  -ldflags="-X main.Version=${CLAIR_VERSION}" \
+  -trimpath -ldflags="-X main.Version=${CLAIR_VERSION}" \
   ./cmd/clair
-RUN go build\
+RUN go build -trimpath \
   ./cmd/clairctl
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal AS init