diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 6e130ee8e5b0adb4851f528843b15f727dfe2833..721b1eee3c028603c2f41fae11d755f8692d1ba0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,8 +5,6 @@ RUN apt-get update
 RUN apt-get install -y clang-format-11
 RUN apt-get install -y golang-1.15
 
-RUN /usr/lib/go-1.5/bin/go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.4.1
-
 RUN apt-get install -y curl
 RUN apt-get install -y cmake
 RUN apt-get install -y python3-pip
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 587cb2498a159c38bf6ba0cea320817ce5d3902c..8a6ab4be40ceb14c0a6681d6d5eb73bd27da92e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,17 @@ variables:
 image: $CI_REGISTRY_IMAGE
 
 stages:
+  - testgo
   - setup
   - test
   - deploy
 
+testgo:
+  tags: [ docker ]
+  stage: testgo
+  script:
+    - go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.4.1
+
 # Build a docker image in which tests for this repository can run
 build-testenv:
   tags: [ cached-dind ]
@@ -69,6 +76,7 @@ pages:
   #only:
     #- web
   script:
+    - go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.4.1
     - mkdir -p build
     - cd build
     - cmake ..