diff --git a/.github/workflows/test-target.yml b/.github/workflows/test-target.yml
index b527a7ee878df..5aabc3b20047b 100644
--- a/.github/workflows/test-target.yml
+++ b/.github/workflows/test-target.yml
@@ -98,7 +98,7 @@ jobs:
       PYTHON_FILTER: "${{ (inputs.test-py2 && !inputs.test-py3) && '2.7' || (!inputs.test-py2 && inputs.test-py3) && (inputs.python-version || '3.12') || '' }}"
       SKIP_ENV_NAME: "${{ (inputs.test-py2 && !inputs.test-py3) && 'py3.*' || (!inputs.test-py2 && inputs.test-py3) && 'py2.*' || '' }}"
       # Windows E2E requires Windows containers
-      DDEV_E2E_AGENT: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows || 'datadog/agent-dev:master-py3-win-servercore') || inputs.agent-image }}"
+      DDEV_E2E_AGENT: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows || 'datadog/agent-dev:kyleneale-bump-python-312-py3-win-servercore') || inputs.agent-image }}"
       DDEV_E2E_AGENT_PY2: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows-py2 || 'datadog/agent-dev:master-py2-win-servercore') || inputs.agent-image-py2 }}"
       # Test results for later processing
       TEST_RESULTS_BASE_DIR: ".test-results"
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/config.py b/datadog_checks_dev/datadog_checks/dev/tooling/config.py
index 6bddaa542925f..93eeb9d2334a2 100644
--- a/datadog_checks_dev/datadog_checks/dev/tooling/config.py
+++ b/datadog_checks_dev/datadog_checks/dev/tooling/config.py
@@ -43,7 +43,7 @@
         'integrations-internal-core': os.path.join('~', 'dd', 'integrations-internal-core'),
     },
     'agents': {
-        'master': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
+        'master': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
         '7': {'docker': 'datadog/agent:7', 'local': '7'},
         '6': {'docker': 'datadog/agent:6', 'local': '6'},
     },
diff --git a/ddev/src/ddev/config/model.py b/ddev/src/ddev/config/model.py
index f467a9e2e990e..327be6406220e 100644
--- a/ddev/src/ddev/config/model.py
+++ b/ddev/src/ddev/config/model.py
@@ -176,7 +176,7 @@ def agents(self):
                 self._field_agents = agents
             else:
                 self._field_agents = self.raw_data['agents'] = {
-                    'dev': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
+                    'dev': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
                     '7': {'docker': 'datadog/agent:7', 'local': '7'},
                 }
 
diff --git a/ddev/src/ddev/e2e/agent/docker.py b/ddev/src/ddev/e2e/agent/docker.py
index b5a1048dcd29e..8819884e3189e 100644
--- a/ddev/src/ddev/e2e/agent/docker.py
+++ b/ddev/src/ddev/e2e/agent/docker.py
@@ -109,7 +109,7 @@ def start(self, *, agent_build: str, local_packages: dict[Path, str], env_vars:
         from ddev.e2e.agent.constants import AgentEnvVars
 
         if not agent_build:
-            agent_build = 'datadog/agent-dev:master'
+            agent_build = 'datadog/agent-dev:kyleneale-bump-python-312-py3'
 
         if agent_build.startswith("datadog/"):
             # Add a potentially missing `py` suffix for default non-RC builds