diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index afbf64c..0e63f53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -285,7 +285,7 @@ jobs:
         if ! diff .github/workflows/ci.yml .github/workflows/ci.yml.backup; then echo "ci.yml.tmpl and ci.yml differs!" && exit 1; fi
     - name: Build Docker image
       run: |-
-        TAG_NAME="${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
+        TAG_NAME="test_${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
         docker build . -t "${IMAGE_NAME}:${TAG_NAME}" \
           --build-arg BASE_VERSION="${BASE_VERSION}" \
           --build-arg SPARK_VERSION="${SPARK_VERSION}" \
diff --git a/push-images.sh b/push-images.sh
index 4013b91..33a703d 100755
--- a/push-images.sh
+++ b/push-images.sh
@@ -5,10 +5,10 @@ echo "${DOCKER_PASSWORD}" | docker login -u="${DOCKER_USERNAME}" --password-stdi
 
 IMAGE_NAME=${IMAGE_NAME:-spark-k8s-addons}
 
-TAG_NAME="test_${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
+TAG_NAME="${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
 docker tag "${IMAGE_NAME}:${TAG_NAME}" "${IMAGE_ORG}/${IMAGE_NAME}:${TAG_NAME}"
 docker push "${IMAGE_ORG}/${IMAGE_NAME}:${TAG_NAME}"
 
-ALT_TAG_NAME="test_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
+ALT_TAG_NAME="${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
 docker tag "${IMAGE_NAME}:${TAG_NAME}" "${IMAGE_ORG}/${IMAGE_NAME}:${ALT_TAG_NAME}"
 docker push "${IMAGE_ORG}/${IMAGE_NAME}:${ALT_TAG_NAME}"
diff --git a/templates/vars.yml b/templates/vars.yml
index 67cc961..2f33a23 100644
--- a/templates/vars.yml
+++ b/templates/vars.yml
@@ -2,27 +2,6 @@ self_version: "v5"
 base_version: "v3"
 
 versions:
-- spark:  ["3.1.3"]
-  hadoop: ["2.7.4", "3.2.0"]
-  scala:  ["2.12"]
-  java:   ["8", "11"]
-  python: ["3.8", "3.9"]
-  image:  ["-buster"]
-
-- spark:  ["3.2.2"]
-  hadoop: ["3.3.1"]
-  scala:  ["2.12", "2.13"]
-  java:   ["8", "11"]
-  python: ["3.8", "3.9"]
-  image:  ["-buster"]
-
-- spark:  ["3.3.0", "3.3.1"]
-  hadoop: ["3.3.2"]
-  scala:  ["2.12", "2.13"]
-  java:   ["8", "11"]
-  python: ["3.8", "3.9"]
-  image:  ["-buster"]
-
 - spark:  ['3.4.1']
   hadoop: ['3.3.4']
   scala:  ['2.12', '2.13']