diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b0cf6aedbcfc47516c816b52c94243ea233145d..900334b5e8460d9667369e1730aa1a21c5bf1a8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
-# @todo: re-structure the use of image tags.
 variables:
   VERSION: ${CI_COMMIT_TAG}
+  CI_VERSION: v2.0.1
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
@@ -27,9 +27,9 @@ php:
   stage: build
   parallel:
     matrix:
-      - PHP: ['7.0','7.1','7.2','7.3','7.4','8.0','8.1']
+      - PHP: ['7.2','7.3','7.4','8.0','8.1']
   script:
-    - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
+    - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
     - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}
   only:
     - tags
diff --git a/Dockerfile b/Dockerfile
index 626555a88af105ca5d6744523bf05f2cf3147bd8..be21428b72a2d4d69b654d09de48309ac1ec00cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 ARG PHP_VERSION
+ARG CI_VERSION
 
-FROM registry.lakedrops.com/docker/gitlab-drupal-ci:php-${PHP_VERSION}
+FROM registry.lakedrops.com/docker/gitlab-drupal-ci/php-${PHP_VERSION}:${CI_VERSION}
 
 ARG VERSION