diff --git a/package/Dockerfile.submariner-gateway b/package/Dockerfile.submariner-gateway
index 7a6fa881d..8144e6f40 100644
--- a/package/Dockerfile.submariner-gateway
+++ b/package/Dockerfile.submariner-gateway
@@ -1,4 +1,4 @@
-ARG BASE_BRANCH
+ARG BASE_BRANCH=devel
 ARG FEDORA_VERSION=41
 ARG SOURCE=/go/src/github.com/submariner-io/submariner
 
@@ -26,7 +26,7 @@ RUN /dnf_install -a ${TARGETPLATFORM} -v ${FEDORA_VERSION} -r /output/gateway \
     glibc bash glibc-minimal-langpack coreutils-single \
     libcurl-minimal iproute libreswan kmod
 
-FROM --platform=${TARGETPLATFORM} scratch
+FROM scratch
 ARG SOURCE
 ARG TARGETPLATFORM
 
@@ -36,4 +36,4 @@ COPY --from=base /output/gateway /
 COPY --from=builder ${SOURCE}/package/submariner.sh ${SOURCE}/package/pluto ${SOURCE}/bin/${TARGETPLATFORM}/submariner-gateway \
   ${SOURCE}/package/await-node-ready.sh ${SOURCE}/bin/${TARGETPLATFORM}/await-node-ready /usr/local/bin/
 
-ENTRYPOINT submariner.sh
+ENTRYPOINT ["submariner.sh"]
diff --git a/package/Dockerfile.submariner-globalnet b/package/Dockerfile.submariner-globalnet
index 3cbd516de..75113cb0b 100644
--- a/package/Dockerfile.submariner-globalnet
+++ b/package/Dockerfile.submariner-globalnet
@@ -1,4 +1,4 @@
-ARG BASE_BRANCH
+ARG BASE_BRANCH=devel
 ARG FEDORA_VERSION=41
 ARG SOURCE=/go/src/github.com/submariner-io/submariner
 
@@ -22,7 +22,7 @@ RUN /dnf_install -a ${TARGETPLATFORM} -v ${FEDORA_VERSION} -r /output/globalnet
     glibc bash glibc-minimal-langpack coreutils-single \
     iproute iptables-legacy iptables-nft ipset grep
 
-FROM --platform=${TARGETPLATFORM} scratch
+FROM scratch
 ARG SOURCE
 ARG TARGETPLATFORM
 
@@ -38,4 +38,4 @@ COPY --from=builder ${SOURCE}/package/iptables-wrapper-installer.sh /usr/sbin/
 # The sanity checks can fail when building foreign arch images; we know we meet the requirements
 RUN /usr/sbin/iptables-wrapper-installer.sh --no-sanity-check
 
-ENTRYPOINT submariner-globalnet.sh
+ENTRYPOINT ["submariner-globalnet.sh"]
diff --git a/package/Dockerfile.submariner-route-agent b/package/Dockerfile.submariner-route-agent
index 2da11cd94..e6627c5fb 100644
--- a/package/Dockerfile.submariner-route-agent
+++ b/package/Dockerfile.submariner-route-agent
@@ -1,4 +1,4 @@
-ARG BASE_BRANCH
+ARG BASE_BRANCH=devel
 ARG FEDORA_VERSION=41
 ARG SOURCE=/go/src/github.com/submariner-io/submariner
 
@@ -23,7 +23,7 @@ RUN /dnf_install -a ${TARGETPLATFORM} -v ${FEDORA_VERSION} -r /output/route-agen
     glibc bash glibc-minimal-langpack coreutils-single \
     iproute iptables-legacy iptables-nft ipset openvswitch procps-ng grep
 
-FROM --platform=${TARGETPLATFORM} scratch
+FROM scratch
 ARG SOURCE
 ARG TARGETPLATFORM
 
@@ -39,4 +39,4 @@ COPY --from=builder ${SOURCE}/package/iptables-wrapper-installer.sh /usr/sbin/
 # The sanity checks can fail when building foreign arch images; we know we meet the requirements
 RUN /usr/sbin/iptables-wrapper-installer.sh --no-sanity-check
 
-ENTRYPOINT submariner-route-agent.sh
+ENTRYPOINT ["submariner-route-agent.sh"]