From a334c06d9cde9740e4b7cae81585686b8849db76 Mon Sep 17 00:00:00 2001
From: Patryk Matuszak <pmatusza@redhat.com>
Date: Wed, 25 Mar 2026 10:03:56 +0100
Subject: [PATCH 1/2] Fix RPM version to include build datetime

---
 src/image/build-rpms.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/image/build-rpms.sh b/src/image/build-rpms.sh
index 2e189a2e..71e6a222 100755
--- a/src/image/build-rpms.sh
+++ b/src/image/build-rpms.sh
@@ -49,9 +49,11 @@ if [[ $(git tag -l "${USHIFT_GITREF}") ]]; then
     MICROSHIFT_VERSION="${USHIFT_GITREF}"
 else
     MICROSHIFT_VERSION="$(awk -F'[=.-]' '{print $2 "." $3 "." $4}' Makefile.version.aarch64.var | sed -e 's/ //g')"
+    # After the X.Y.Z, add build timestamp for correct ordering of the RPMs based on the version.
+    MICROSHIFT_VERSION="${MICROSHIFT_VERSION}-$(date -u +%Y%m%d%H%M)"
 fi
 # Example results:
-# - 4.21.0_ga9cd00b34_4.21.0_okd_scos.ec.5                for build against HEAD of main which was 4.21 at the time.
+# - 4.21.0-202511271015-ga9cd00b34_4.21.0_okd_scos.ec.5   for build against HEAD of main which was 4.21 at the time.
 # - 4.20.0-202510201126.p0-g1c4675ace_4.20.0-okd-scos.6   for build against a specific tag.
 MICROSHIFT_VERSION="${MICROSHIFT_VERSION}-g${SOURCE_GIT_COMMIT}-${OKD_VERSION_TAG}"
 # MicroShift's make-rpm.sh makes this substitution. Although we don't use the script,
@@ -80,4 +82,3 @@ if [[ "${target}" == "all" || "${target}" == "srpm" ]]; then
     ./packaging/rpm/make-rpm.sh srpm local
     echo "${MICROSHIFT_VERSION}" > _output/rpmbuild/SRPMS/version.txt
 fi
-

From bbe71d59bb984b06bf48398efeb250a81a8e94ef Mon Sep 17 00:00:00 2001
From: Patryk Matuszak <pmatusza@redhat.com>
Date: Wed, 25 Mar 2026 10:05:24 +0100
Subject: [PATCH 2/2] Fix copr workflows names

---
 .github/workflows/copr-build-and-test.yaml | 2 +-
 .github/workflows/copr-experimental.yaml   | 2 +-
 .github/workflows/copr-nightly.yaml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/copr-build-and-test.yaml b/.github/workflows/copr-build-and-test.yaml
index ba8feccd..fb625871 100644
--- a/.github/workflows/copr-build-and-test.yaml
+++ b/.github/workflows/copr-build-and-test.yaml
@@ -1,4 +1,4 @@
-name: copr-build-test
+name: copr-build-and-test
 
 on:
   workflow_call:
diff --git a/.github/workflows/copr-experimental.yaml b/.github/workflows/copr-experimental.yaml
index 1d019627..8d7b2c8b 100644
--- a/.github/workflows/copr-experimental.yaml
+++ b/.github/workflows/copr-experimental.yaml
@@ -1,4 +1,4 @@
-name: experimental-copr
+name: copr-experimental
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/copr-nightly.yaml b/.github/workflows/copr-nightly.yaml
index 07437db1..acf4374b 100644
--- a/.github/workflows/copr-nightly.yaml
+++ b/.github/workflows/copr-nightly.yaml
@@ -1,4 +1,4 @@
-name: nightly-copr
+name: copr-nightly
 
 on:
   schedule: