diff --git a/.github/workflows/builder-image.yml b/.github/workflows/builder-image.yml
index f5dbeaa4..79d53c42 100644
--- a/.github/workflows/builder-image.yml
+++ b/.github/workflows/builder-image.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: Push builder image to Docker Hub
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/ci.Dockerfile b/ci.Dockerfile
index 1f073d1a..ee630744 100644
--- a/ci.Dockerfile
+++ b/ci.Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 RUN pacman -Syu --overwrite=* --needed --noconfirm go fakeroot binutils gcc make git gettext &&\
     rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/*
 
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.32.2
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.38.0
 
 COPY go.mod .