docker image

build/ci/.build-container.yml

-image: docker:19.03.12
 
 services:
   - docker:19.03.12-dind
@@ -8,6 +7,7 @@ variables:
   DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 build:docker:
+  image: docker:19.03.12
   tags:
     - dind
   stage: build
@@ -23,10 +23,11 @@ build:docker:
         -t $DOCKER_IMAGE_SHA .
 
 .deploy: &deploy
+  image: docker:19.03.12
   stage: deploy
   needs: ["build:docker"]
   tags:
-    - baremetal
+    - dind
   script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - docker tag $DOCKER_IMAGE_SHA $TAG

build/ci/.terraform-ci.yml

-image: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
 
 variables:
   TF_ROOT: ${CI_PROJECT_DIR}/test/terraform
@@ -10,6 +9,7 @@ cache:
     - ${TF_ROOT}/.terraform
 
 .terraform_prefab: &tf
+  image: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
   variables:
     CI_DEBUG_TRACE: "false"
   before_script: