diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c9e21a0285299..e8e6d6d2c082b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -62,11 +62,11 @@
 /.gitlab/functional_test/system_probe.yml            @DataDog/agent-network @DataDog/agent-platform
 /.gitlab/functional_test_cleanup.yml                 @DataDog/agent-security @DataDog/agent-network @DataDog/agent-platform
 
-/.gitlab/image_build/                                @DataDog/container-integrations @DataDog/agent-platform
+/.gitlab/container_build/                            @DataDog/container-integrations @DataDog/agent-platform
 
-/.gitlab/image_deploy/                               @DataDog/container-integrations @DataDog/agent-platform
+/.gitlab/dev_container_deploy/                       @DataDog/container-integrations @DataDog/agent-platform
 
-/.gitlab/image_scan.yml                              @DataDog/container-integrations @DataDog/agent-platform
+/.gitlab/container_scan.yml                          @DataDog/container-integrations @DataDog/agent-platform
 
 /.gitlab/internal_deploy.yml                         @DataDog/agent-network @DataDog/agent-platform
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 920efd03d3a0d..733116503bf41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,10 @@ include:
   - /.gitlab/kitchen_deploy.yml
   - /.gitlab/kitchen_testing.yml
   - /.gitlab/pkg_metrics.yml
-  - /.gitlab/image_build.yml
-  - /.gitlab/image_scan.yml
+  - /.gitlab/container_build.yml
+  - /.gitlab/container_scan.yml
   - /.gitlab/check_deploy.yml
-  - /.gitlab/image_deploy.yml
+  - /.gitlab/dev_container_deploy.yml
   - /.gitlab/deploy_6.yml
   - /.gitlab/deploy_7.yml
   - /.gitlab/choco_build.yml
@@ -61,10 +61,10 @@ stages:
   - kitchen_deploy
   - kitchen_testing
   - pkg_metrics
-  - image_build
-  - image_scan
+  - container_build
+  - container_scan
   - check_deploy
-  - image_deploy
+  - dev_container_deploy
   - deploy6
   - deploy7
   - choco_build
diff --git a/.gitlab/container_build.yml b/.gitlab/container_build.yml
new file mode 100644
index 0000000000000..9a7dc425c2947
--- /dev/null
+++ b/.gitlab/container_build.yml
@@ -0,0 +1,7 @@
+---
+# container_build stage
+# Contains jobs to build container images of the Agent.
+
+include:
+  - /.gitlab/container_build/docker_linux.yml
+  - /.gitlab/container_build/docker_windows.yml
diff --git a/.gitlab/image_build/docker_linux.yml b/.gitlab/container_build/docker_linux.yml
similarity index 99%
rename from .gitlab/image_build/docker_linux.yml
rename to .gitlab/container_build/docker_linux.yml
index cc9481736feec..b089486a3f794 100644
--- a/.gitlab/image_build/docker_linux.yml
+++ b/.gitlab/container_build/docker_linux.yml
@@ -1,6 +1,6 @@
 ---
 .docker_build_job_definition:
-  stage: image_build
+  stage: container_build
   script:
     - aws s3 sync --only-show-errors $S3_ARTIFACTS_URI $BUILD_CONTEXT
     - TAG_SUFFIX=${TAG_SUFFIX:-}
diff --git a/.gitlab/image_build/docker_windows.yml b/.gitlab/container_build/docker_windows.yml
similarity index 96%
rename from .gitlab/image_build/docker_windows.yml
rename to .gitlab/container_build/docker_windows.yml
index f0d52a955b3c9..ab980e2a85740 100644
--- a/.gitlab/image_build/docker_windows.yml
+++ b/.gitlab/container_build/docker_windows.yml
@@ -1,6 +1,6 @@
 ---
 .docker_build_windows_job_definition:
-  stage: image_build
+  stage: container_build
   before_script:
     - $ErrorActionPreference = "Stop"
     - mkdir ci-scripts
@@ -53,7 +53,6 @@
     - .docker_build_agent_windows_common
   rules:
     !reference [.on_a7]
-  stage: image_build
   needs: ["windows_msi_and_bosh_zip_x64-a7", "build_windows_container_entrypoint"]
   variables:
     AGENT_ZIP: "datadog-agent-7*-x86_64.zip"
@@ -64,7 +63,6 @@
     - .docker_build_agent_windows_common
   rules:
     !reference [.on_a6]
-  stage: image_build
   needs: ["windows_msi_x64-a6", "build_windows_container_entrypoint"]
   variables:
     AGENT_ZIP: "datadog-agent-6*-x86_64.zip"
@@ -85,5 +83,5 @@
     SERVERCORE: "-servercore"
 
 include:
-  - /.gitlab/image_build/docker_windows_agent6.yml
-  - /.gitlab/image_build/docker_windows_agent7.yml
+  - /.gitlab/container_build/docker_windows_agent6.yml
+  - /.gitlab/container_build/docker_windows_agent7.yml
diff --git a/.gitlab/image_build/docker_windows_agent6.yml b/.gitlab/container_build/docker_windows_agent6.yml
similarity index 100%
rename from .gitlab/image_build/docker_windows_agent6.yml
rename to .gitlab/container_build/docker_windows_agent6.yml
diff --git a/.gitlab/image_build/docker_windows_agent7.yml b/.gitlab/container_build/docker_windows_agent7.yml
similarity index 100%
rename from .gitlab/image_build/docker_windows_agent7.yml
rename to .gitlab/container_build/docker_windows_agent7.yml
diff --git a/.gitlab/image_scan.yml b/.gitlab/container_scan.yml
similarity index 92%
rename from .gitlab/image_scan.yml
rename to .gitlab/container_scan.yml
index baabb380c6453..464aa047dfe5e 100644
--- a/.gitlab/image_scan.yml
+++ b/.gitlab/container_scan.yml
@@ -1,12 +1,12 @@
 ---
-# image_scan stage
-# Contains jobs to deploy Docker images of the Agent to specific Dockerhub repos
+# container_scan stage
+# Contains jobs to deploy container images of the Agent to specific Dockerhub repos
 # (datadog/agent-scan and datadog/dogstatsd-scan) to be scanned.
 
 # push every night to docker hub agent-scan repo
 scan_nightly-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs:
@@ -18,7 +18,7 @@ scan_nightly-dogstatsd:
 
 scan_nightly-a6:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_deploy_nightly_repo_branch_a6]
   needs:
@@ -35,7 +35,7 @@ scan_nightly-a6:
 
 scan_nightly-a7:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs:
@@ -52,7 +52,7 @@ scan_nightly-a7:
 
 dca_scan_nightly:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs: ["docker_build_cluster_agent_amd64"]
@@ -64,7 +64,7 @@ dca_scan_nightly:
 # push on master to docker hub agent-scan repo
 scan_master-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_main_a7]
   needs:
@@ -76,7 +76,7 @@ scan_master-dogstatsd:
 
 scan_master-a6:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_main_a6]
   needs:
@@ -93,7 +93,7 @@ scan_master-a6:
 
 scan_master-a7:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_main_a7]
   needs:
@@ -110,7 +110,7 @@ scan_master-a7:
 
 dca_scan_master:
   extends: .docker_publish_job_definition
-  stage: image_scan
+  stage: container_scan
   rules:
     !reference [.on_main_a7]
   needs: ["docker_build_cluster_agent_amd64"]
diff --git a/.gitlab/deploy_6.yml b/.gitlab/deploy_6.yml
index 0c986ec26ee40..59a69ebc9b070 100644
--- a/.gitlab/deploy_6.yml
+++ b/.gitlab/deploy_6.yml
@@ -3,6 +3,6 @@
 # Contains jobs which deploy Agent 6 to staging repositories and to Dockerhub / GCR.
 
 include:
-  - /.gitlab/deploy_6/docker.yml
+  - /.gitlab/deploy_6/container.yml
   - /.gitlab/deploy_6/nix.yml
   - /.gitlab/deploy_6/windows.yml
diff --git a/.gitlab/deploy_6/docker.yml b/.gitlab/deploy_6/container.yml
similarity index 90%
rename from .gitlab/deploy_6/docker.yml
rename to .gitlab/deploy_6/container.yml
index 9953403373eb4..a50e7ad1e058b 100644
--- a/.gitlab/deploy_6/docker.yml
+++ b/.gitlab/deploy_6/container.yml
@@ -9,7 +9,7 @@
 # Image tagging & manifest publication
 #
 
-.deploy-a6-base:
+.deploy_containers-a6-base:
   extends: .docker_publish_job_definition
   stage: deploy6
   dependencies: []
@@ -24,15 +24,14 @@
           - "-jmx"
 
 
-deploy-a6:
-  extends: .deploy-a6-base
+deploy_containers-a6:
+  extends: .deploy_containers-a6-base
   rules:
     !reference [.on_deploy_a6_manual_auto_on_rc]
 
 
-
-deploy-a6-rc:
-  extends: .deploy-a6-base
+deploy_containers-a6-rc:
+  extends: .deploy_containers-a6-base
   rules:
     !reference [.on_deploy_a6_rc]
   variables:
@@ -43,7 +42,7 @@ deploy-a6-rc:
 # Latest publication
 #
 
-deploy_latest-a6:
+deploy_containers_latest-a6:
   extends: .docker_publish_job_definition
   stage: deploy6
   rules:
diff --git a/.gitlab/deploy_7.yml b/.gitlab/deploy_7.yml
index f225b6741fd8c..4e000539ac687 100644
--- a/.gitlab/deploy_7.yml
+++ b/.gitlab/deploy_7.yml
@@ -4,7 +4,7 @@
 
 include:
   - /.gitlab/deploy_7/cluster_agent_cloudfoundry.yml
-  - /.gitlab/deploy_7/docker.yml
+  - /.gitlab/deploy_7/container.yml
   - /.gitlab/deploy_7/install_script.yml
   - /.gitlab/deploy_7/nix.yml
   - /.gitlab/deploy_7/windows.yml
diff --git a/.gitlab/deploy_7/docker.yml b/.gitlab/deploy_7/container.yml
similarity index 94%
rename from .gitlab/deploy_7/docker.yml
rename to .gitlab/deploy_7/container.yml
index 6b45fbeb71b69..ee0946aaf83e1 100644
--- a/.gitlab/deploy_7/docker.yml
+++ b/.gitlab/deploy_7/container.yml
@@ -9,7 +9,7 @@
 # Image tagging & manifest publication
 #
 
-.deploy-a7-base:
+.deploy_containers-a7-base:
   extends: .docker_publish_job_definition
   stage: deploy7
   dependencies: []
@@ -30,22 +30,21 @@
           - "-servercore"
 
 
-deploy-a7:
-  extends: .deploy-a7-base
+deploy_containers-a7:
+  extends: .deploy_containers-a7-base
   rules:
     !reference [.on_deploy_a7_manual_auto_on_rc]
 
 
-
-deploy-a7-rc:
-  extends: .deploy-a7-base
+deploy_containers-a7-rc:
+  extends: .deploy_containers-a7-base
   rules:
     !reference [.on_deploy_a7_rc]
   variables:
     VERSION: 7-rc
 
 
-deploy-dogstatsd:
+deploy_containers-dogstatsd:
   extends: .docker_publish_job_definition
   stage: deploy7
   rules:
@@ -61,7 +60,7 @@ deploy-dogstatsd:
 # Latest publication
 #
 
-deploy_latest-a7:
+deploy_containers_latest-a7:
   extends: .docker_publish_job_definition
   stage: deploy7
   rules:
@@ -82,7 +81,7 @@ deploy_latest-a7:
         IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-win1909-servercore-amd64,%BASE%-win2004-servercore-amd64,%BASE%-win20h2-servercore-amd64,%BASE%-winltsc2022-servercore-amd64"
         IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-jmx,${AGENT_REPOSITORY}:latest-servercore-jmx
 
-deploy_latest-dogstatsd:
+deploy_containers_latest-dogstatsd:
   extends: .docker_publish_job_definition
   stage: deploy7
   rules:
diff --git a/.gitlab/dev_container_deploy.yml b/.gitlab/dev_container_deploy.yml
new file mode 100644
index 0000000000000..82f26e5e83a51
--- /dev/null
+++ b/.gitlab/dev_container_deploy.yml
@@ -0,0 +1,8 @@
+---
+# dev_container_deploy stage
+# Contains jobs to container Docker images of the Agent
+# (in the datadog/agent-dev | datadog/dogstatsd-dev Dockerhub repos).
+
+include:
+  - /.gitlab/dev_container_deploy/docker_linux.yml
+  - /.gitlab/dev_container_deploy/docker_windows.yml
diff --git a/.gitlab/image_deploy/docker_linux.yml b/.gitlab/dev_container_deploy/docker_linux.yml
similarity index 94%
rename from .gitlab/image_deploy/docker_linux.yml
rename to .gitlab/dev_container_deploy/docker_linux.yml
index 2a5d8a797506d..06073aaf6779c 100644
--- a/.gitlab/image_deploy/docker_linux.yml
+++ b/.gitlab/dev_container_deploy/docker_linux.yml
@@ -7,7 +7,7 @@
 
 dev_branch-a6:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a6_manual]
   needs:
@@ -27,7 +27,7 @@ dev_branch-a6:
 
 dev_branch-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a7_manual]
   needs:
@@ -40,7 +40,7 @@ dev_branch-dogstatsd:
 
 dev_branch-a7:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a7_manual]
   needs:
@@ -57,7 +57,7 @@ dev_branch-a7:
 
 dev_branch_multiarch-a6:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_all_builds_a6_manual]
   needs:
@@ -79,7 +79,7 @@ dev_branch_multiarch-a6:
 
 dev_branch_multiarch-a7:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_all_builds_a7_manual]
   needs:
@@ -98,7 +98,7 @@ dev_branch_multiarch-a7:
 
 dev_branch_multiarch-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a7_manual]
   needs:
@@ -111,7 +111,7 @@ dev_branch_multiarch-dogstatsd:
 
 dev_master-a6:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a6]
   needs:
@@ -129,7 +129,7 @@ dev_master-a6:
 
 dev_master-a7:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a7]
   needs:
@@ -146,7 +146,7 @@ dev_master-a7:
 
 dev_master-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a7]
   needs:
@@ -159,7 +159,7 @@ dev_master-dogstatsd:
 
 dca_dev_branch:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a7_manual]
   needs:
@@ -171,7 +171,7 @@ dca_dev_branch:
 
 dca_dev_branch_multiarch:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_all_builds_a7_manual]
   needs:
@@ -184,7 +184,7 @@ dca_dev_branch_multiarch:
 
 dca_dev_master:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a7]
   needs:
@@ -197,7 +197,7 @@ dca_dev_master:
 # deploys nightlies to agent-dev
 dev_nightly_docker_hub-a6:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_deploy_nightly_repo_branch_a6]
   needs:
@@ -216,7 +216,7 @@ dev_nightly_docker_hub-a6:
 # deploys nightlies to agent-dev
 dev_nightly-a7:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs:
@@ -234,7 +234,7 @@ dev_nightly-a7:
 # deploys nightlies to agent-dev
 dev_nightly-dogstatsd:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs:
diff --git a/.gitlab/image_deploy/docker_windows.yml b/.gitlab/dev_container_deploy/docker_windows.yml
similarity index 98%
rename from .gitlab/image_deploy/docker_windows.yml
rename to .gitlab/dev_container_deploy/docker_windows.yml
index 99cb7c0566bba..bf133c25e7fee 100644
--- a/.gitlab/image_deploy/docker_windows.yml
+++ b/.gitlab/dev_container_deploy/docker_windows.yml
@@ -7,7 +7,7 @@
 
 dev_branch-a7-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a7_manual]
   needs:
@@ -50,7 +50,7 @@ dev_branch-a7-windows:
 
 dev_branch-a6-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_a6_manual]
   needs:
@@ -69,7 +69,7 @@ dev_branch-a6-windows:
 
 dev_master-a7-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a7]
   needs:
@@ -112,7 +112,7 @@ dev_master-a7-windows:
 
 dev_master-a6-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_main_a6]
   needs:
@@ -131,7 +131,7 @@ dev_master-a6-windows:
 
 dev_nightly-a7-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_deploy_nightly_repo_branch_a7]
   needs:
@@ -174,7 +174,7 @@ dev_nightly-a7-windows:
 
 dev_nightly-a6-windows:
   extends: .docker_publish_job_definition
-  stage: image_deploy
+  stage: dev_container_deploy
   rules:
     !reference [.on_deploy_nightly_repo_branch_a6]
   needs:
diff --git a/.gitlab/image_build.yml b/.gitlab/image_build.yml
deleted file mode 100644
index 5f592e16b9247..0000000000000
--- a/.gitlab/image_build.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# image_build stage
-# Contains jobs to build Docker images of the Agent.
-
-include:
-  - /.gitlab/image_build/docker_linux.yml
-  - /.gitlab/image_build/docker_windows.yml
diff --git a/.gitlab/image_deploy.yml b/.gitlab/image_deploy.yml
deleted file mode 100644
index 1d02e9f481778..0000000000000
--- a/.gitlab/image_deploy.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# image_build stage
-# Contains jobs to deploy Docker images of the Agent, both internal and external
-# (in the datadog/agent-dev | datadog/dogstatsd-dev Dockerhub repos).
-
-include:
-  - /.gitlab/image_deploy/docker_linux.yml
-  - /.gitlab/image_deploy/docker_windows.yml