diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a826b61d113d408478bd00e266e42084c741983..e2a242cbd81444e75eb5e5a08076769b9c6334b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,17 +4,13 @@ include:
   file: docker_hub.gitlab-ci.yml
 
 .build_flutter_base:
-  extends: .build_image_job_template
-  variables:
-    BUILD_ARGS: FLUTTER_VERSION=${VERSION}
-
-.build_old_flutter_base:
-  extends: .build_old_version
   variables:
     BUILD_ARGS: FLUTTER_VERSION=${VERSION}
 
 "3.24.5":
-  extends: .build_flutter_base
+  extends: 
+  - .build_flutter_base
+  - .build_image_job_template
   variables:
     IMAGE_BASENAME: ${IMAGE_PREFIX}/flutter
     VERSION: 3.24.5