diff --git a/.github/actions/build_docker_image/action.yml b/.github/actions/build_docker_image/action.yml
index 571ed2b7..29154f0e 100644
--- a/.github/actions/build_docker_image/action.yml
+++ b/.github/actions/build_docker_image/action.yml
@@ -24,6 +24,7 @@ inputs:
   dockerhub_repo:
     description: DockerHub repository name
     required: false
+    default: ""
   dockerhub_description:
     description: Short description of the image
     required: false
diff --git a/.github/workflows/build_clio_docker_image.yml b/.github/workflows/build_clio_docker_image.yml
index ab0ddd52..0b4b0205 100644
--- a/.github/workflows/build_clio_docker_image.yml
+++ b/.github/workflows/build_clio_docker_image.yml
@@ -97,5 +97,5 @@ jobs:
           directory: docker/clio
           tags: ${{ inputs.tags }}
           platforms: linux/amd64
-          dockerhub_repo: rippleci/clio
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio' || '' }}
           dockerhub_description: Clio is an XRP Ledger API server.
diff --git a/.github/workflows/update_docker_ci.yml b/.github/workflows/update_docker_ci.yml
index a649acb1..5f642d68 100644
--- a/.github/workflows/update_docker_ci.yml
+++ b/.github/workflows/update_docker_ci.yml
@@ -69,7 +69,7 @@ jobs:
         with:
           images: |
             ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
-            rippleci/clio_gcc
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
           push_image: ${{ github.event_name != 'pull_request' }}
           directory: docker/compilers/gcc
           tags: |
@@ -81,7 +81,7 @@ jobs:
           build_args: |
             GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
             GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
           dockerhub_description: GCC compiler for XRPLF/clio.
 
   gcc-arm64:
@@ -107,7 +107,7 @@ jobs:
         with:
           images: |
             ${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
-            rippleci/clio_gcc
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
           push_image: ${{ github.event_name != 'pull_request' }}
           directory: docker/compilers/gcc
           tags: |
@@ -119,7 +119,7 @@ jobs:
           build_args: |
             GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
             GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
           dockerhub_description: GCC compiler for XRPLF/clio.
 
   gcc-merge:
@@ -196,7 +196,7 @@ jobs:
         with:
           images: |
             ${{ needs.repo.outputs.GHCR_REPO }}/clio-clang
-            rippleci/clio_clang
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
           push_image: ${{ github.event_name != 'pull_request' }}
           directory: docker/compilers/clang
           tags: |
@@ -206,7 +206,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           build_args: |
             CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
-          dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
           dockerhub_description: Clang compiler for XRPLF/clio.
 
   tools-amd64:
@@ -321,7 +321,7 @@ jobs:
         with:
           images: |
             ${{ needs.repo.outputs.GHCR_REPO }}/clio-ci
-            rippleci/clio_ci
+            ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
           push_image: ${{ github.event_name != 'pull_request' }}
           directory: docker/ci
           tags: |
@@ -334,5 +334,5 @@ jobs:
             CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
             GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
             GCC_VERSION=${{ env.GCC_VERSION }}
-          dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
+          dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
           dockerhub_description: CI image for XRPLF/clio.
diff --git a/docker/compilers/clang/Dockerfile b/docker/compilers/clang/Dockerfile
index 284b07ba..e9782c49 100644
--- a/docker/compilers/clang/Dockerfile
+++ b/docker/compilers/clang/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
 
 ARG CLANG_MAJOR_VERSION=invalid
 # Bump this version to force rebuild of the image
-ARG BUILD_VERSION=0
+ARG BUILD_VERSION=1
 
 RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
     && chmod +x llvm.sh \
diff --git a/docker/compilers/gcc/Dockerfile b/docker/compilers/gcc/Dockerfile
index 672dd9ee..d76f5748 100644
--- a/docker/compilers/gcc/Dockerfile
+++ b/docker/compilers/gcc/Dockerfile
@@ -8,7 +8,7 @@ ARG UBUNTU_VERSION
 
 ARG GCC_MAJOR_VERSION
 
-ARG BUILD_VERSION=0
+ARG BUILD_VERSION=1
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG TARGETARCH
diff --git a/docker/tools/Dockerfile b/docker/tools/Dockerfile
index 32459dff..0b90666c 100644
--- a/docker/tools/Dockerfile
+++ b/docker/tools/Dockerfile
@@ -8,7 +8,7 @@ ARG TARGETARCH
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-ARG BUILD_VERSION=1
+ARG BUILD_VERSION=2
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends --no-install-suggests \