diff --git a/.github/workflows/build-solr.yml b/.github/workflows/build-solr.yml
index 8248637..9034ede 100644
--- a/.github/workflows/build-solr.yml
+++ b/.github/workflows/build-solr.yml
@@ -51,7 +51,9 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ matrix.version }} CONFIG_VERSION=${{ matrix.config_version }}
+          build-args: |
+              "VERSION=${{ matrix.version }}"
+              "CONFIG_VERSION=${{ matrix.config_version }}"
           context: "{{defaultContext}}:${{ env.SUBDIRECTORY }}"
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}
diff --git a/.github/workflows/build-tugboat-solr.yml b/.github/workflows/build-tugboat-solr.yml
index f092d09..7fd151d 100644
--- a/.github/workflows/build-tugboat-solr.yml
+++ b/.github/workflows/build-tugboat-solr.yml
@@ -51,7 +51,9 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v4
         with:
-          build-args: VERSION=${{ matrix.version }} CONFIG_VERSION=${{ matrix.config_version }}
+          build-args: |
+              "VERSION=${{ matrix.version }}"
+              "CONFIG_VERSION=${{ matrix.config_version }}"
           context: "{{defaultContext}}:${{ env.SUBDIRECTORY }}"
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.version }}
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 1da37b4..3269d01 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,4 +1,5 @@
 ARG VERSION=latest
+ARG CONFIG_VERSION=9
 
 FROM solr:$VERSION
 
diff --git a/tugboat-solr/Dockerfile b/tugboat-solr/Dockerfile
index 8dad567..7d584ce 100644
--- a/tugboat-solr/Dockerfile
+++ b/tugboat-solr/Dockerfile
@@ -1,4 +1,5 @@
 ARG VERSION=latest
+ARG CONFIG_VERSION=9
 
 FROM tugboatqa/solr:$VERSION