diff --git a/ci/docker/Makefile b/ci/docker/Makefile
index f092c50469b..0229a86b684 100644
--- a/ci/docker/Makefile
+++ b/ci/docker/Makefile
@@ -19,40 +19,36 @@
 .DEFAULT_GOAL := help
 
 help:
-	@echo 'fedora26         create ATS docker image for Fedora 26'
-	@echo 'fedora27         create ATS docker image for Fedora 27'
-	@echo 'fedora28         create ATS docker image for Fedora 28'
-	@echo 'fedora29         create ATS docker image for Fedora 29'
-	@echo 'fedora30         create ATS docker image for Fedora 30'
-	@echo 'centos6          create ATS docker image for Centos 6'
+	@echo 'fedora31         create ATS docker image for Fedora 31'
+	@echo 'fedora32         create ATS docker image for Fedora 32'
+	@echo 'fedora33         create ATS docker image for Fedora 33'
+	@echo 'fedora34         create ATS docker image for Fedora 34'
 	@echo 'centos7          create ATS docker image for Centos 7'
+	@echo 'centos8          create ATS docker image for Centos 8'
 	@echo 'all              build all images'
 
 all: fedora centos
 
 # Fedora Docker images
-fedora: fedora26 fedora27 fedora28
+fedora: fedora31 fedora32 fedora33 fedora34
 
-fedora26:
-	docker build -t ats_$@ --build-arg OS_VERSION=26 --build-arg OS_TYPE=fedora yum/
+fedora31:
+	docker build -t ats_$@ --build-arg OS_VERSION=31 --build-arg OS_TYPE=fedora yum/
 
-fedora27:
-	docker build -t ats_$@ --build-arg OS_VERSION=27 --build-arg OS_TYPE=fedora yum/
+fedora32:
+	docker build -t ats_$@ --build-arg OS_VERSION=32 --build-arg OS_TYPE=fedora yum/
 
-fedora28:
-	docker build -t ats_$@ --build-arg OS_VERSION=28 --build-arg OS_TYPE=fedora yum/
+fedora33:
+	docker build -t ats_$@ --build-arg OS_VERSION=33 --build-arg OS_TYPE=fedora yum/
 
-fedora29:
-	docker build -t ats_$@ --build-arg OS_VERSION=29 --build-arg OS_TYPE=fedora yum/
-
-fedora30:
-	docker build -t ats_$@ --build-arg OS_VERSION=30 --build-arg OS_TYPE=fedora yum/
+fedora34:
+	docker build -t ats_$@ --build-arg OS_VERSION=34 --build-arg OS_TYPE=fedora yum/
 
 # Centos Docker images
-centos: centos6 centos7
-
-centos6:
-	docker build -t ats_$@ --build-arg OS_VERSION=6 --build-arg OS_TYPE=centos yum/
+centos: centos7 centos8
 
 centos7:
 	docker build -t ats_$@ --build-arg OS_VERSION=7 --build-arg OS_TYPE=centos yum/
+
+centos8:
+	docker build -t ats_$@ --build-arg OS_VERSION=8 --build-arg OS_TYPE=centos yum/