diff --git a/rocky-devel-beta.conf b/rocky-devel-beta.conf
new file mode 100644
index 0000000..6723719
--- /dev/null
+++ b/rocky-devel-beta.conf
@@ -0,0 +1,66 @@
+from shared/variables import *
+from rocky/variables import *
+from rocky/beta_variables import *
+from shared/all import *
+from rocky/override import *
+
+# PRODUCT INFO 
+release_name = "Rocky Development" 
+release_short = "Rocky-devel"
+version = "8-devel"
+
+skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files']
+
+# GENERAL SETTINGS
+multilib = [
+    ('^.*$', {
+        'x86_64': ['devel', 'runtime']
+    }),
+]
+
+variants_file = 'variants-devel.xml'
+sigkeys = ['6D745A60']
+hashed_directories = True
+
+# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64']
+tree_arches = ['aarch64', 'i686', 'x86_64']
+
+# PKGSET
+koji_profile = "koji"
+pkgset_koji_inherit = True
+
+# PKGSET - KOJI
+filter_system_release_packages = False
+
+# GATHER
+gather_prepopulate = "devel-prepopulate.json"
+gather_selfhosting = True
+gather_method = "deps"
+
+gather_backend = "dnf"
+check_deps = False
+greedy_method = "none"
+repoclosure_backend = "dnf"
+
+# CHECKSUMS
+media_checksums = ['sha256']
+media_checksum_one_file = True
+create_jigdo = False
+
+
+buildinstall_skip = [
+    ("^(devel|AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
+       "*": True
+       }),
+]
+
+# LOOKASIDE
+variant_as_lookaside = [
+]
+
+gather_lookaside_repos = [
+]
+
+productimg = False
+
+comps_file = ""
diff --git a/scripts/produce-8-beta-full.sh b/scripts/produce-8-beta-full.sh
index 0745c61..23b8eaa 100755
--- a/scripts/produce-8-beta-full.sh
+++ b/scripts/produce-8-beta-full.sh
@@ -10,6 +10,14 @@ if [ "$ret_val" -ne 0 ]; then
 fi
 unset ret_val
 
+bash updates-8-devel-beta.sh
+
+ret_val=$?
+if [ "$ret_val" -ne 0 ]; then
+  exit 1
+fi
+unset ret_val
+
 bash updates-8-extras-beta.sh
 
 ret_val=$?
diff --git a/scripts/updates-8-devel-beta.sh b/scripts/updates-8-devel-beta.sh
new file mode 100755
index 0000000..e223fcd
--- /dev/null
+++ b/scripts/updates-8-devel-beta.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+source "$(dirname "$0")/common-8"
+export PATH=/usr/sbin:/usr/bin:/root/bin
+TARGET_DIR="/mnt/compose/8-BETA"
+SHORT=devel
+CONFIG=/etc/pungi-beta/rocky-devel-beta.conf
+# Unused for now
+OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Rocky-$SHORT-8/COMPOSE_ID)
+SKIP="--skip-phase buildinstall --skip-phase createiso --skip-phase extra_isos --skip-phase productimg"
+LABEL="--test"
+
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $SKIP $LABEL"
+#COMPOSE_ID="Rocky-8-20210625.n.0"
+
+if [ -z "$COMPOSE_ID" ]; then
+  CMD="$CMD --target-dir=$TARGET_DIR"
+else
+  CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
+fi
+
+time $CMD
+ret_val=$?
+
+if [[ "$ret_val" != "0" ]]; then
+  if [[ "$MAILNOTIF" == "yes" ]]; then
+    echo "This is a notification that a recent beta $SHORT compose failed on $(hostname)" | mutt -e "set from=\"$FROM\"" \
+        -e 'set envelope_from=yes' \
+        -s "Compose $NEWCOMPOSE_ID failed (for Rocky Linux $REVISION)" \
+        releng@rockylinux.org
+  fi
+  exit 1
+fi
+
+if [ "$ret_val" -eq 0 ]; then
+  pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
+  if [ -d "i386" ]; then
+    echo "Moving i386 to i686"
+    mv i386 i686
+  fi
+  popd || { echo "Could not switch."; exit 1; }
+fi