diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3eff7984923dd9a23934665e40046809559d96b8..a4502ab6e42a0cbd5267058b0574536f701d42f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
   - qa
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   tags:
     - gitlab-org
 
@@ -68,12 +68,13 @@ danger-review:
   stage: test
   artifacts:
     paths:
-    - ruby/tmp/gitaly-rspec-test.log
+      - ruby/tmp/gitaly-rspec-test.log
+    reports:
+      junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
     when: on_failure
     expire_in: 1 week
 
 .postgres_template: &postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   services:
     - postgres:${POSTGRES_VERSION}
   variables: &postgres_variables
@@ -121,7 +122,6 @@ proto:
 
 build:
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   cache:
     <<: *cache_configuration
     policy: pull-push
@@ -141,7 +141,6 @@ build:
 binaries:
   <<: *cache_definition
   stage: build
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   only:
     - tags
   script:
@@ -162,7 +161,6 @@ binaries:
 test:
   <<: *test_definition
   <<: *postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   script:
     - _build/deps/git/install/bin/git version
     # This command will make all directories except of our build directory and Ruby code unwritable.
@@ -170,11 +168,6 @@ test:
     # they should all instead use a temporary directory for runtime data.
     - find . -type d \( -path ./_build -o -path ./ruby \) -prune -o -type d -exec chmod a-w {} \;
     - make ${TARGET}
-  artifacts:
-    paths:
-      - _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
-    reports:
-      junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml
   parallel:
     matrix:
       # These definitions are for the non-default Git versions.
@@ -196,7 +189,6 @@ test:
 nightly:git:
   <<: *test_definition
   <<: *postgres_definition
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31
   script:
     - go version
     - make all ${TARGET}
@@ -281,13 +273,6 @@ pgbouncer_test:
   script:
     - make test-postgres
 
-lint:
-  stage: test
-  retry: 2
-  script:
-    - go version
-    - make lint
-
 objectinfo_fuzz_test:
   extends: .fuzz_base
   stage: test