diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml
index d661ad9bee..a3a57c1f6a 100644
--- a/.circleci/config.templ.yml
+++ b/.circleci/config.templ.yml
@@ -80,7 +80,7 @@ commands:
     description: "Install riot"
     steps:
       # Make sure we install and run riot on Python 3
-      - run: pip3 install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+      - run: pip3 install riot==0.20.0
 
   setup_rust:
     description: "Install rust toolchain"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f7cbac693..fcf74292ee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
           name: Generate config
           command: |
             export GIT_COMMIT_DESC=$(git log -n 1 $CIRCLE_SHA1)
-            pip3 install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+            pip3 install riot==0.20.0
             riot -P -v run --pass-env -s circleci-gen-config -- -v
       - continuation/continue:
           configuration_path: .circleci/config.gen.yml
diff --git a/.github/workflows/generate-package-versions.yml b/.github/workflows/generate-package-versions.yml
index 394c2f5a8b..b375ec9586 100644
--- a/.github/workflows/generate-package-versions.yml
+++ b/.github/workflows/generate-package-versions.yml
@@ -77,7 +77,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install packaging
           pip install requests
-          pip install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+          pip install riot==0.20.0
 
       - name: Run regenerate-riot-latest
         run: scripts/regenerate-riot-latest.sh
diff --git a/.github/workflows/requirements-locks.yml b/.github/workflows/requirements-locks.yml
index 45e56c85ca..b1703e9c27 100644
--- a/.github/workflows/requirements-locks.yml
+++ b/.github/workflows/requirements-locks.yml
@@ -25,7 +25,7 @@ jobs:
         run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12
 
       - name: Install Dependencies
-        run: pip install --upgrade pip && pip install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+        run: pip install --upgrade pip && pip install riot==0.20.0
 
       - name: Generate riot locks
         run: scripts/compile-and-prune-test-requirements
diff --git a/.gitlab/package.yml b/.gitlab/package.yml
index d8631c994f..115ada9f26 100644
--- a/.gitlab/package.yml
+++ b/.gitlab/package.yml
@@ -8,7 +8,7 @@ build_base_venvs:
     CMAKE_BUILD_PARALLEL_LEVEL: 12
     PIP_VERBOSE: 1
   script:
-    - pip install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+    - pip install riot==0.20.0
     - riot -P -v generate --python=$PYTHON_VERSION
   artifacts:
     name: venv_$PYTHON_VERSION
diff --git a/.gitlab/tests.yml b/.gitlab/tests.yml
index 50dafe61bd..8d1b3d16d5 100644
--- a/.gitlab/tests.yml
+++ b/.gitlab/tests.yml
@@ -40,7 +40,7 @@ variables:
   services:
     - !reference [.services, ddagent]
   script:
-    - pip install riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact
+    - pip install riot==0.20.0
     - unset DD_SERVICE
     - unset DD_ENV
     - unset DD_TAGS
diff --git a/hatch.toml b/hatch.toml
index d4fa033039..f3cf8a21b9 100644
--- a/hatch.toml
+++ b/hatch.toml
@@ -17,7 +17,7 @@ dependencies = [
     "ddapm-test-agent>=1.2.0",
     "packaging==23.1",
     "pygments==2.16.1",
-    "riot @ git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact",
+    "riot==0.20.0",
     "ruff==0.1.3",
     "clang-format==18.1.5",
     "cmake-format==0.6.13",
diff --git a/scripts/ddtest b/scripts/ddtest
index 6fa3579366..d4bc6e90a0 100755
--- a/scripts/ddtest
+++ b/scripts/ddtest
@@ -19,7 +19,7 @@ fi
 for i in {1..3}; do $compose_cmd pull -q testrunner && break || sleep 3; done
 
 # TODO(DEV): Install riot in the docker image
-FULL_CMD="pip install -q --disable-pip-version-check riot@git+https://www.github.com/DataDog/riot@taegyunkim/upload-artifact && $CMD"
+FULL_CMD="pip install -q --disable-pip-version-check riot==0.20.0 && $CMD"
 
 # install and upgrade riot in case testrunner image has not been updated
 # DEV: Use `--no-TTY` and `--quiet-pull` when running in CircleCI