diff --git a/releng/koji-infratag-move-prod b/releng/koji-infratag-move-prod
deleted file mode 100755
index 77d2448a4..000000000
--- a/releng/koji-infratag-move-prod
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-
-set -e
-
-usage()
-{
-    cat >&2 <<EOF
-usage: $0 NVR [NVR ...]
-
-Tag NVRs to proper infra staging repo.  The NVR must reference existing
-non-scratch build in Koji.
-
-Note that Koji suffers from race condition issues, and if you specify multiple
-NVRs - each is submitted to Koji as a separate task.  Such tasks are processed
-concurrently, and due to the race the final repository might miss some of the
-packages.  WORKAROUND: Submit all NVRs at once, wait a few minutes, and submit
-again.
-EOF
-}
-die() { echo >&2 "FATAL: $*"; exit 1; }
-
-test -n "$1" || { usage && exit 1 ; }
-
-fedoras=
-for build; do
-    fedora_version=${build//*fc/}
-    case $fedora_version in
-        [0-9][0-9]) ;;
-        *) die "wrong fedora id '$fedora_version'" ;;
-    esac
-
-    case $fedoras in
-    *" $fedora_version "*) ;;  # already in
-    *) fedoras="$fedoras $fedora_version "
-    esac
-
-    eval "fedora_$fedora_version=\"\$fedora_$fedora_version $build\""
-done
-
-for fedora in $fedoras; do
-    eval "builds=\$fedora_$fedora"
-    echo "Infra STG $fedora:$builds"
-    koji move "f$fedora"-infra-stg f"$fedora"-infra $builds
-done
diff --git a/releng/koji-infratag-move-prod b/releng/koji-infratag-move-prod
new file mode 120000
index 000000000..2cfb2b3fe
--- /dev/null
+++ b/releng/koji-infratag-move-prod
@@ -0,0 +1 @@
+koji-infratag-staging
\ No newline at end of file
diff --git a/releng/koji-infratag-staging b/releng/koji-infratag-staging
index fd9afdab3..a1c11d848 100755
--- a/releng/koji-infratag-staging
+++ b/releng/koji-infratag-staging
@@ -21,24 +21,48 @@ die() { echo >&2 "FATAL: $*"; exit 1; }
 
 test -n "$1" || { usage && exit 1 ; }
 
-fedoras=
+where_to=STAGE
+case $(basename "$0") in
+*move-prod)
+    where_to=PROD
+    ;;
+esac
+
+distros=
 for build; do
-    fedora_version=${build//*fc/}
-    case $fedora_version in
-        [0-9][0-9]) ;;
-        *) die "wrong fedora id '$fedora_version'" ;;
+
+    case $build in
+    *fc[0-9][0-9])
+        distro=f
+        distro_version=${build//*fc/}
+        ;;
+    *el[0-9]|*el[0-9][0-9])
+        distro=epel
+        distro_version=${build//*el/}
+        ;;
+    *) die "Unknown build: $build" ;;
+    esac
+
+    case $distro_version in
+        [0-9][0-9]|[0-9]) ;;
+        *) die "wrong $distro id '$distro_version'" ;;
     esac
 
-    case $fedoras in
-    *" $fedora_version "*) ;;  # already in
-    *) fedoras="$fedoras $fedora_version "
+    id=${distro}$distro_version
+    case $distros in
+    *" $id "*) ;;  # already in
+    *) distros="$distros $id "
     esac
 
-    eval "fedora_$fedora_version=\"\$fedora_$fedora_version $build\""
+    eval "distro_$id=\"\$distro_$id $build\""
 done
 
-for fedora in $fedoras; do
-    eval "builds=\$fedora_$fedora"
-    echo "Infra STG $fedora:$builds"
-    koji tag-build "f$fedora-infra-candidate" $builds
+for distro in $distros; do
+    eval "builds=\$distro_$distro"
+    echo "Infra $where_to $distro -> $builds"
+    if test $where_to = STAGE; then
+        koji tag-build "$distro-infra-candidate" $builds
+    else
+        koji move "$distro"-infra-stg "$distro"-infra $builds
+    fi
 done