diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a33ea1..282537a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,60 +1,60 @@
 name: Test
 on:
   # Run CI on all pushes to the master and release/** branches, and on all new
   # pull requests, and on all pushes to pull requests (even if a pull request
   # is not against master).
   push:
     branches:
       - "master"
       - "release/**"
   pull_request:
 env:
-  DOCKER_COMPOSE_VERSION: 1.24.1
+  DOCKER_COMPOSE_VERSION: 1.29.2
 defaults:
   run:
     shell: bash
 jobs:
   unit-test:
     runs-on: ubuntu-20.04
     name: "unit tests"
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Unit Tests
         working-directory: install
         run: find ./ -type f -name "*-test.sh" -exec "./{}" \;
 
   integration-test:
     runs-on: ubuntu-20.04
     name: "integration test"
     steps:
       - name: Pin docker-compose
         run: |
           sudo rm /usr/local/bin/docker-compose
           curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
           chmod +x docker-compose
           sudo mv docker-compose /usr/local/bin
 
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Integration Test
         run: |
           echo "Testing initial install"
           # Create ./certificates here because install.sh will create it with root:root
           # and then run.sh (-> setup.sh) won't be able to write to it.
           mkdir certificates
           ./install.sh
           ./_integration-test/run.sh
           echo "Testing in-place upgrade"
           # Also test plugin installation here
           echo "sentry-auth-oidc" >> sentry/requirements.txt
           ./install.sh --minimize-downtime
           ./_integration-test/run.sh
 
       - name: Inspect failure
         if: failure()
         run: |
           docker-compose ps
           docker-compose logs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd03a88..31d829c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,27 +1,27 @@
 # Changelog
 
 ## Unreleased
 
 - feat: Support custom CA roots ([#27062](https://github.com/getsentry/sentry/pull/27062)), see the [docs](https://develop.sentry.dev/self-hosted/custom-ca-roots/) for more details.
 - fix: Fix `curl` image to version 7.77.0
+- upgrade: docker-compose version to 1.29.2
 
 ## 21.7.0
 
 - No documented changes.
 
 ## 21.6.3
 
 - No documented changes.
 
 ## 21.6.2
 
 - BREAKING CHANGE: The frontend bundle will be loaded asynchronously (via [#25744](https://github.com/getsentry/sentry/pull/25744)). This is a breaking change that can affect custom plugins that access certain globals in the django template. Please see https://forum.sentry.io/t/breaking-frontend-changes-for-custom-plugins/14184 for more information.
 
 ## 21.6.1
 
 - No documented changes.
 
 ## 21.6.0
 
 - feat: Add healthchecks for redis, memcached and postgres (#975)
-