diff --git a/.github/workflows/generic_build.yml b/.github/workflows/generic_build.yml
index 281fbf81..8bba1ad4 100644
--- a/.github/workflows/generic_build.yml
+++ b/.github/workflows/generic_build.yml
@@ -114,12 +114,17 @@ jobs:
         for arch in $archs_and_images ; do
           arch=$(echo $arch_and_image | cut -f1 -d "=")
           base_image=$(echo $arch_and_image | cut -f2 -d "=")
+          BASE_IMAGE_BUILD_ARG=""
+          if [ ! -z "$base_image" ]; then
+            BASE_IMAGE_BUILD_ARG="--build_arg=base_image="${base_image}""
+          fi
+
           iidfile="$( mktemp )"
           buildah bud \
             --arch="${arch}" \
             --iidfile="${iidfile}" \
-            --build_arg=base_image="${base_image}" \
-            $BUILD_ARGS
+            $BUILD_ARGS \
+            $BASE_IMAGE_BUILD_ARG
           image_id="$( cat "${iidfile}" )"
           rm "${iidfile}"