diff --git a/almalinux-ha.repo b/almalinux-ha.repo
index f89c70c..6ff5fcc 100644
--- a/almalinux-ha.repo
+++ b/almalinux-ha.repo
@@ -1,9 +1,9 @@
 # almalinux-ha.repo
 
 [ha]
-name=AlmaLinux $releasever - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
+name=AlmaLinux 8.4-beta - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/$basearch/os/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -11,9 +11,9 @@ fastestmirror=1
 
 ## Sources
 [ha-source]
-name=AlmaLinux $releasever - HighAvailability Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/Source/
+name=AlmaLinux 8.4-beta - HighAvailability Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha-source
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -21,9 +21,9 @@ fastestmirror=1
 
 ## Debuginfo
 [ha-debuginfo]
-name=AlmaLinux $releasever - HighAvailability debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/debug/$basearch/
+name=AlmaLinux 8.4-beta - HighAvailability debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/ha-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
diff --git a/almalinux-release.spec b/almalinux-release.spec
index 915dff0..d809bb3 100644
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@@ -6,13 +6,15 @@
 %define contentdir almalinux
 %define infra_var stock
 %define base_release_version 8
-%define full_release_version 8.3
+%define full_release_version 8.4
 %define dist_release_version 8
-%define upstream_rel_long 8.3-1
-%define upstream_rel 8.3
-%define almalinux_rel 4
+%define upstream_rel_long 8.4-1
+%define upstream_rel 8.4
+%define almalinux_rel 1
 %define dist .el%{dist_release_version}
 
+%define beta Beta
+
 # The anaconda scripts in %%{_libexecdir} can create false requirements
 %global __requires_exclude_from %{_libexecdir}
 
@@ -175,6 +177,9 @@ rm -rf %{buildroot}
 %{_prefix}/lib/systemd/system-preset/*
 
 %changelog
+* Fri Apr 16 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-1
+- 8.4 beta release
+
 * Wed Mar 24 2021 Andrei Lukoshko <alukoshko@almalinux.org> - 8.3-4
 - 8.3 stable release
 
diff --git a/almalinux.repo b/almalinux.repo
index 485a8c9..f958373 100644
--- a/almalinux.repo
+++ b/almalinux.repo
@@ -1,36 +1,36 @@
 # almalinux.repo
 
 [baseos]
-name=AlmaLinux $releasever - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
+name=AlmaLinux 8.4-beta - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream]
-name=AlmaLinux $releasever - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
+name=AlmaLinux 8.4-beta - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools]
-name=AlmaLinux $releasever - PowerTools
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/
+name=AlmaLinux 8.4-beta - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/PowerTools/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras]
-name=AlmaLinux $releasever - Extras
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/
+name=AlmaLinux 8.4-beta - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/extras/$basearch/os/
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -38,36 +38,36 @@ fastestmirror=1
 
 ## Sources
 [baseos-source]
-name=AlmaLinux $releasever - BaseOS Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/Source/
+name=AlmaLinux 8.4-beta - BaseOS Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos-source
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream-source]
-name=AlmaLinux $releasever - AppStream Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/Source/
+name=AlmaLinux 8.4-beta - AppStream Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream-source
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools-source]
-name=AlmaLinux $releasever - PowerTools Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/
+name=AlmaLinux 8.4-beta - PowerTools Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools-source
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/PowerTools/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras-source]
-name=AlmaLinux $releasever - Extras Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/Source/
+name=AlmaLinux 8.4-beta - Extras Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras-source
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/extras/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
@@ -75,36 +75,36 @@ fastestmirror=1
 
 ## Debuginfo
 [baseos-debuginfo]
-name=AlmaLinux $releasever - BaseOS debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/
+name=AlmaLinux 8.4-beta - BaseOS debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/baseos-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [appstream-debuginfo]
-name=AlmaLinux $releasever - AppStream debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/debug/$basearch/
+name=AlmaLinux 8.4-beta - AppStream debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/appstream-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [powertools-debuginfo]
-name=AlmaLinux $releasever - PowerTools debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/
+name=AlmaLinux 8.4-beta - PowerTools debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/powertools-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/PowerTools/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fastestmirror=1
 
 [extras-debuginfo]
-name=AlmaLinux $releasever - Extras debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo
-# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/debug/$basearch/
+name=AlmaLinux 8.4-beta - Extras debuginfo
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.4-beta/extras-debuginfo
+# baseurl=https://repo.almalinux.org/almalinux/8.4-beta/extras/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux