diff --git a/.github/scripts/build-mender-packages b/.github/scripts/build-mender-packages
index caa0feb..9c5e9f0 100755
--- a/.github/scripts/build-mender-packages
+++ b/.github/scripts/build-mender-packages
@@ -21,6 +21,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "${SCRIPT_DIR}/../../edi-pi"
 
 EDI_PI_CONFIG_NAME=pi-cross-dev-v2
+
+if [ ! -f "${EDI_PI_CONFIG_NAME}.yml" ]
+then
+    EDI_PI_CONFIG_NAME=pi-cross-dev
+fi
+
 DEBIAN_RELEASE=$(edi project make --config ${EDI_PI_CONFIG_NAME}.yml | grep debian_distribution_release | cut -d':' -f 2 | xargs)
 EXPECTED_PODMAN_IMAGE=mender-dist-packages-builder-debian-${DEBIAN_RELEASE}
 
diff --git a/.github/scripts/upload-mender-packages-packagecloud b/.github/scripts/upload-mender-packages-packagecloud
index 3753ec9..0b3cc76 100755
--- a/.github/scripts/upload-mender-packages-packagecloud
+++ b/.github/scripts/upload-mender-packages-packagecloud
@@ -28,6 +28,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cd "${SCRIPT_DIR}/../../edi-pi"
 EDI_PI_CONFIG_NAME=pi-cross-dev-v2
+
+if [ ! -f "${EDI_PI_CONFIG_NAME}.yml" ]
+then
+    EDI_PI_CONFIG_NAME=pi-cross-dev
+fi
+
 DISTRIBUTION_RELEASE=$(edi project make --config ${EDI_PI_CONFIG_NAME}.yml | grep debian_distribution_release | cut -d':' -f 2 | xargs)
 
 cd "${SCRIPT_DIR}/../../mender-dist-packages"