diff --git a/.github/actions/setup-ipfs/action.yml b/.github/actions/setup-ipfs/action.yml
index aa558968..91958e6e 100644
--- a/.github/actions/setup-ipfs/action.yml
+++ b/.github/actions/setup-ipfs/action.yml
@@ -6,7 +6,7 @@ runs:
     - uses: ipfs/download-ipfs-distribution-action@v1
       with:
         name: go-ipfs
-        version: "${{ env.GO_IPFS_VER }}"
+        version: "${{ env.KUBO_VER }}"
     - uses: ipfs/download-ipfs-distribution-action@v1
       with:
         name: ipfs-cluster-ctl
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f481b1b9..995acc0d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,8 +16,8 @@ on:
 
 env:
  DIST_ROOT: ${{ github.event.inputs.custom_dist_root || '/ipns/dist.ipfs.tech' }} # content root used for calculating diff to build
- GO_IPFS_VER: 'v0.15.0'          # go-ipfs daemon used for chunking and applying diff
- CLUSTER_CTL_VER: 'v1.0.4'       # ipfs-cluster-ctl used for pinning
+ KUBO_VER: 'v0.21.0'       # kubo daemon used for chunking and applying diff
+ CLUSTER_CTL_VER: 'v1.0.4' # ipfs-cluster-ctl used for pinning
 
 jobs:
   build:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bdad9394..6ad2f872 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -12,8 +12,8 @@ on:
 
 env:
  DIST_ROOT: ${{ github.event.inputs.custom_dist_root || '/ipns/dist.ipfs.tech' }} # content root used for calculating diff to build
- GO_IPFS_VER: 'v0.15.0'          # go-ipfs daemon used for chunking and applying diff
- CLUSTER_CTL_VER: 'v1.0.4'      # ipfs-cluster-ctl used for pinning
+ KUBO_VER: 'v0.21.0'       # kubo daemon used for chunking and applying diff
+ CLUSTER_CTL_VER: 'v1.0.4' # ipfs-cluster-ctl used for pinning
 
 concurrency:
   group: nightly
diff --git a/Dockerfile b/Dockerfile
index cde672b2..b2dc8e38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,11 @@ FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND noninteractive
 ARG USER_UID
 
-ARG GO_IPFS_VER
+ARG KUBO_VER
 RUN apt-get update -q && apt-get install -y git curl gnupg jq build-essential gawk zip tzdata && \
     ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
     dpkg-reconfigure --frontend noninteractive tzdata
-RUN curl -s "https://dist.ipfs.tech/go-ipfs/${GO_IPFS_VER}/go-ipfs_${GO_IPFS_VER}_linux-amd64.tar.gz" | tar vzx -C /usr/local/bin/ go-ipfs/ipfs --strip-components=1
+RUN curl -s "https://dist.ipfs.tech/kubo/${KUBO_VER}/kubo_${KUBO_VER}_linux-amd64.tar.gz" | tar vzx -C /usr/local/bin/ kubo/ipfs --strip-components=1
 
 RUN adduser --shell /bin/bash --home /asdf --disabled-password --gecos asdf asdf --uid $USER_UID
 ENV PATH="${PATH}:/asdf/.asdf/shims:/asdf/.asdf/bin"
diff --git a/dists/go-ipfs/versions b/dists/go-ipfs/versions
index 6f46c6c6..67305862 100644
--- a/dists/go-ipfs/versions
+++ b/dists/go-ipfs/versions
@@ -92,3 +92,4 @@ v0.21.0-rc1
 v0.21.0-rc2
 v0.21.0-rc3
 v0.21.0
+v0.22.0-rc1
diff --git a/dists/kubo/versions b/dists/kubo/versions
index 92de6c4c..cef664ec 100644
--- a/dists/kubo/versions
+++ b/dists/kubo/versions
@@ -22,3 +22,4 @@ v0.21.0-rc1
 v0.21.0-rc2
 v0.21.0-rc3
 v0.21.0
+v0.22.0-rc1
diff --git a/dockerized b/dockerized
index cc6e36cb..727f7423 100755
--- a/dockerized
+++ b/dockerized
@@ -19,7 +19,7 @@ if [[ "$(docker images -q "$IMAGE_NAME:$IMAGE_TAG" 2> /dev/null)" == "" ]]; then
     docker build . -t "$IMAGE_NAME:$IMAGE_TAG" \
         --build-arg CACHEBUST="$IMAGE_TAG" \
         --build-arg USER_UID="$(id -u "$USER")" \
-        --build-arg GO_IPFS_VER="${GO_IPFS_VER:-$(curl -s https://dist.ipfs.tech/go-ipfs/versions | tail -n 1)}" # match http api client version on CI
+        --build-arg KUBO_VER="${KUBO_VER:-$(curl -s https://dist.ipfs.tech/kubo/versions | tail -n 1)}" # match http api client version on CI
 
 fi