diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48b5f75..aac748b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,10 +100,10 @@ ruby-alpine-aws test: *test_build
 gitlab-charts-build-base test: *test_build
 gitlab-charts-build-base-helm-3 test: *test_build
 gitlab-helm3-kubectl1.14 test: *test_build
-gitlab-qa-ruby-2.6 test: *test_build
 gitlab-qa-ruby-2.7 test: *test_build
-gitlab-qa-alpine-ruby-2.6 test: *test_build
+gitlab-qa-ruby-3.0 test: *test_build
 gitlab-qa-alpine-ruby-2.7 test: *test_build
+gitlab-qa-alpine-ruby-3.0 test: *test_build
 gitlab-puppeteer test: *test_build
 omnibus-gitlab-bionic test: *test_build
 omnibus-gitlab-centos7 test: *test_build
@@ -175,10 +175,10 @@ ruby-alpine-aws: *build_and_deploy
 gitlab-charts-build-base: *build_and_deploy
 gitlab-charts-build-base-helm-3: *build_and_deploy
 gitlab-helm3-kubectl1.14: *build_and_deploy
-gitlab-qa-ruby-2.6: *build_and_deploy
 gitlab-qa-ruby-2.7: *build_and_deploy
-gitlab-qa-alpine-ruby-2.6: *build_and_deploy
+gitlab-qa-ruby-3.0: *build_and_deploy
 gitlab-qa-alpine-ruby-2.7: *build_and_deploy
+gitlab-qa-alpine-ruby-3.0: *build_and_deploy
 gitlab-puppeteer: *build_and_deploy
 omnibus-gitlab-bionic: *build_and_deploy
 omnibus-gitlab-centos7: *build_and_deploy
diff --git a/Dockerfile.gitlab-qa-alpine-ruby-2.6 b/Dockerfile.gitlab-qa-alpine-ruby-3.0
similarity index 98%
rename from Dockerfile.gitlab-qa-alpine-ruby-2.6
rename to Dockerfile.gitlab-qa-alpine-ruby-3.0
index d7f83ce..89b61c0 100644
--- a/Dockerfile.gitlab-qa-alpine-ruby-2.6
+++ b/Dockerfile.gitlab-qa-alpine-ruby-3.0
@@ -3,7 +3,7 @@
 #  - Nightly QA: https://gitlab.com/gitlab-org/quality/nightly/blob/master/.gitlab-ci.yml
 #  - QA Pipeline Common: https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa.yml, https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/qa-scheduled.yml
 
-FROM ruby:2.6-alpine
+FROM ruby:3.0-alpine
 MAINTAINER GitLab Quality Team
 
 WORKDIR /home/qa
diff --git a/Dockerfile.gitlab-qa-ruby-2.6 b/Dockerfile.gitlab-qa-ruby-3.0
similarity index 96%
rename from Dockerfile.gitlab-qa-ruby-2.6
rename to Dockerfile.gitlab-qa-ruby-3.0
index b9519d1..cda9991 100644
--- a/Dockerfile.gitlab-qa-ruby-2.6
+++ b/Dockerfile.gitlab-qa-ruby-3.0
@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:3.0
 
 
 # Enable support for UTF encoded stdin/stdout