diff --git a/.gitea/workflows/gtk-rpm-release.yaml b/.gitea/workflows/gtk-rpm-release.yaml
index 17b4fa6..89ddf21 100644
--- a/.gitea/workflows/gtk-rpm-release.yaml
+++ b/.gitea/workflows/gtk-rpm-release.yaml
@@ -10,6 +10,10 @@ permissions:
   releases: write
   packages: write
 
+env:
+  RPM_DISTRO_NAME: fedora
+  RPM_DISTRO_VERSION: '43'
+
 jobs:
   build-gtk-rpm-release:
     runs-on: ubuntu-latest
@@ -60,6 +64,8 @@ jobs:
         env:
           RELEASE_TAG: ${{ github.ref_name }}
           RPM_PACKAGE_GROUP: ${{ vars.RPM_PACKAGE_GROUP }}
+          RPM_DISTRO_NAME: ${{ env.RPM_DISTRO_NAME }}
+          RPM_DISTRO_VERSION: ${{ env.RPM_DISTRO_VERSION }}
         run: |
           set -eu
 
@@ -92,10 +98,12 @@ jobs:
             exit 1
           fi
 
+          package_group="${RPM_PACKAGE_GROUP:-${RPM_DISTRO_NAME}/${RPM_DISTRO_VERSION}}"
+
           {
             printf 'RELEASE_VERSION=%s\n' "$version"
             printf 'RELEASE_ASSETS_DIR=%s\n' "$assets_dir"
-            printf 'RPM_PACKAGE_GROUP=%s\n' "${RPM_PACKAGE_GROUP:-}"
+            printf 'RPM_PACKAGE_GROUP=%s\n' "$package_group"
           } >> "$GITHUB_ENV"
 
       - name: Upload RPMs to Gitea package registry
@@ -110,7 +118,7 @@ jobs:
           set -eu
 
           owner="${GITEA_REPOSITORY_OWNER}"
-          package_user="${RPM_PACKAGE_USERNAME:-}"
+          package_user="${RPM_PACKAGE_USERNAME:-${GITEA_REPOSITORY_OWNER}}"
           token="${RPM_PACKAGE_TOKEN:-}"
           group="${RPM_PACKAGE_GROUP:-}"