diff --git a/.github/workflows/docs-and-linting.yml b/.github/workflows/docs-and-linting.yml
index 30be61e3a..2e958caa9 100644
--- a/.github/workflows/docs-and-linting.yml
+++ b/.github/workflows/docs-and-linting.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.10', '1.11', '1.12']
+        go: ['1.15', '1.16', '1.17']
 
     name: Documentation and Linting
     steps:
diff --git a/Makefile b/Makefile
index edef0a100..80ffad5b3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ DOC_FILES := \
 FIGURE_FILES := \
 	img/media-types.png
 
-TOOLS := esc gitvalidation glide glide-vc
+TOOLS := esc gitvalidation 
 
 default: check-license lint test
 
@@ -120,12 +120,6 @@ install.tools: $(TOOLS:%=.install.%)
 .install.gitvalidation:
 	go get -u github.com/vbatts/git-validation
 
-.install.glide:
-	go get -u github.com/Masterminds/glide
-
-.install.glide-vc:
-	go get -u github.com/sgotti/glide-vc
-
 clean:
 	rm -rf *~ $(OUTPUT_DIRNAME) header.html