diff --git a/build-push.sh b/build-push.sh
index e846cbf..4fd1084 100755
--- a/build-push.sh
+++ b/build-push.sh
@@ -21,23 +21,25 @@ for RELEASE_TUPLE in "${TARGETS[@]}"; do
     [[ "$FEDORA_NUMERAL" =~ $REGEX ]] && REPO="fc$FEDORA_NUMERAL" || REPO=${RAWHIDE}
     [[ "$FEDORA_NUMERAL" =~ $REGEX ]] && RELEASE="f$FEDORA_NUMERAL" || RELEASE="$FEDORA_NUMERAL"
 
-    echo "Building from upstream tag :${FEDORA_NUMERAL}${ARCH} for release $RELEASE using repo demus-$REPO"
-    docker buildx build \
-        --progress plain \
-        --tag git.demus.dk/demus/${RELEASE}-minimal-rpmbuild:${VERSION} \
-        --tag git.demus.dk/demus/${RELEASE}-minimal-rpmbuild:latest \
-        --build-arg DOCKER_TAG=${FEDORA_NUMERAL}${ARCH} \
-        --build-arg REPO=${REPO} \
-        --build-arg VERSION=${VERSION} \
-        --build-arg GITHASH=$(git rev-parse HEAD) \
-        --build-arg TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
-        --network=host \
-        fedora-minimal-rpmbuild
-
-    docker push git.demus.dk/demus/${RELEASE}-minimal-rpmbuild:latest
-    docker push git.demus.dk/demus/${RELEASE}-minimal-rpmbuild:${VERSION}
-
-    echo
-    echo ----------------------
-    echo
+    for SUBDIR in $(ls -d fedora-minimal-*); do
+        echo "Building from upstream tag :${FEDORA_NUMERAL}${ARCH} for release $RELEASE using repo demus-$REPO"
+        IMAGE_POSTFIX=${SUBDIR#fedora-}
+        docker buildx build \
+            --progress plain \
+            --tag git.demus.dk/demus/${RELEASE}-${IMAGE_POSTFIX}:${VERSION} \
+            --tag git.demus.dk/demus/${RELEASE}-${IMAGE_POSTFIX}:latest \
+            --build-arg DOCKER_TAG=${FEDORA_NUMERAL}${ARCH} \
+            --build-arg REPO=${REPO} \
+            --build-arg VERSION=${VERSION} \
+            --build-arg GITHASH=$(git rev-parse HEAD) \
+            --build-arg TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
+            --network=host \
+            ${SUBDIR}
+    
+        docker push git.demus.dk/demus/${RELEASE}-${IMAGE_POSTFIX}:latest
+        docker push git.demus.dk/demus/${RELEASE}-${IMAGE_POSTFIX}:${VERSION}
+        echo
+        echo ----------------------
+        echo
+    done
 done
diff --git a/fedora-minimal-fedpkg/Dockerfile b/fedora-minimal-fedpkg/Dockerfile
new file mode 100644
index 0000000..10d1200
--- /dev/null
+++ b/fedora-minimal-fedpkg/Dockerfile
@@ -0,0 +1,34 @@
+ARG DOCKER_TAG=rawhide
+FROM registry.fedoraproject.org/fedora-minimal:$DOCKER_TAG
+
+ARG REPO
+ARG TIMESTAMP
+ARG GITHASH
+ARG VERSION
+
+RUN echo install_weak_deps=false >> /etc/dnf/dnf.conf && \
+    microdnf -y install --nodocs dnf5-plugins && \
+    microdnf config-manager addrepo --overwrite --create-missing-dir --from-repofile=https://git.demus.dk/api/packages/demus/rpm/demus-${REPO}.repo && \
+    microdnf repo list && \
+    microdnf -y remove python3-dnf && \
+    microdnf -y --refresh upgrade && \
+    microdnf -y install --nodocs fedpkg && \
+    microdnf clean all && \
+    rm -fR /usr/share/{zoneinfo,locale}
+
+CMD [ "/bin/bash" ]
+
+LABEL \
+org.opencontainers.image.authors="Daniel Demus" \
+org.opencontainers.image.created=${TIMESTAMP} \
+org.opencontainers.image.description="Unofficial docker images used by act_runner to run workflows." \
+org.opencontainers.image.documentation=https://git.demus.dk/demus/gitea-act-runner-images/src/branch/main/README.md \
+org.opencontainers.image.licenses=GPL-3.0-or-later \
+org.opencontainers.image.revision=${GITHASH} \
+org.opencontainers.image.source=https://git.demus.dk/demus/gitea-act-runner-images \
+org.opencontainers.image.title="Official Gitea Actions runner images" \
+org.opencontainers.image.url=https://git.demus.dk/demus/gitea-act-runner-images \
+org.opencontainers.image.vendor="Daniel Demus" \
+org.opencontainers.image.version=v${VERSION}
+
+
diff --git a/rawhide.release b/rawhide.release
index d948bcc..a4a7761 100644
--- a/rawhide.release
+++ b/rawhide.release
@@ -1 +1 @@
-fc43
+fc44