diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index f9f27c288da..e4dc9cbf5bb 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -147,7 +147,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       - name: Log in to Docker Hub
         uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
diff --git a/changelog/unreleased/PR#4356-update-docker-setup-buildx-action-action.yml b/changelog/unreleased/PR#4356-update-docker-setup-buildx-action-action.yml
new file mode 100644
index 00000000000..c00fc3ae84d
--- /dev/null
+++ b/changelog/unreleased/PR#4356-update-docker-setup-buildx-action-action.yml
@@ -0,0 +1,7 @@
+title: Update docker/setup-buildx-action action to v4
+type: dependency_update
+authors:
+- name: solrbot
+links:
+- name: PR#4356
+  url: https://github.com/apache/solr/pull/4356