diff --git a/CHANGELOG b/CHANGELOG
index 62402de..c21940d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+* Tue Apr 18 2023 Sérgio Basto <sergio@serjux.com> - 38.1-1
+- F38 GA
+
 * Wed Feb 22 2023 Sérgio Basto <sergio@serjux.com> - 38.0-1
 - F38 Branched
 
diff --git a/Makefile b/Makefile
index eaaf26c..58b6e75 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=38.0
+VERSION=38.1
 RELEASE=1
 
 .ONESHELL: # Applies to every targets in the file!
diff --git a/README.txt b/README.txt
index b8e4f71..d26c194 100644
--- a/README.txt
+++ b/README.txt
@@ -3,10 +3,8 @@ pushd ..
 git clone https://github.com/rpm-software-management/mock.git
 popd
 pushd ../mock/mock-core-configs
-git pull
-git tag | grep mock-core-configs | tail -n1
-#git reset --hard %{name}-%{version}
-#(example:  git reset --hard mock-core-configs-29.2-1)
+git fetch
+#git tag | grep mock-core-configs | tail -n1
 git reset --hard $(git tag | grep mock-core-configs | tail -n1)
 popd
 
@@ -84,9 +82,9 @@ git show
 rfpkg push && rfpkg build --nowait
 
 # Build other branches
+git checkout f38 && git merge master && git push && rfpkg build --nowait; git checkout master
 git checkout f37 && git merge master && git push && rfpkg build --nowait; git checkout master
 git checkout f36 && git merge master && git push && rfpkg build --nowait; git checkout master
-git checkout f35 && git merge master && git push && rfpkg build --nowait; git checkout master
 git checkout el9 && git merge master && git push && rfpkg build --nowait; git checkout master
 git checkout el8 && git merge master && git push && rfpkg build --nowait; git checkout master
 git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
diff --git a/etc/mock/fedora+rpmfusion_free-38-aarch64.cfg b/etc/mock/fedora+rpmfusion_free-38-aarch64.cfg
index e3c3819..cd4f1df 100644
--- a/etc/mock/fedora+rpmfusion_free-38-aarch64.cfg
+++ b/etc/mock/fedora+rpmfusion_free-38-aarch64.cfg
@@ -1,2 +1,2 @@
 include('fedora-38-aarch64.cfg')
-include('templates/rpmfusion_free-branched.tpl')
+include('templates/rpmfusion_free-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_free-38-i386.cfg b/etc/mock/fedora+rpmfusion_free-38-i386.cfg
index e166ac6..6bc3d63 100644
--- a/etc/mock/fedora+rpmfusion_free-38-i386.cfg
+++ b/etc/mock/fedora+rpmfusion_free-38-i386.cfg
@@ -1,2 +1,2 @@
 include('fedora-38-i386.cfg')
-include('templates/rpmfusion_free-branched.tpl')
+include('templates/rpmfusion_free-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_free-38-ppc64le.cfg b/etc/mock/fedora+rpmfusion_free-38-ppc64le.cfg
index 9a63eb7..1bd93fb 100644
--- a/etc/mock/fedora+rpmfusion_free-38-ppc64le.cfg
+++ b/etc/mock/fedora+rpmfusion_free-38-ppc64le.cfg
@@ -1,2 +1,2 @@
 include('fedora-38-ppc64le.cfg')
-include('templates/rpmfusion_free-branched.tpl')
+include('templates/rpmfusion_free-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_free-38-x86_64.cfg b/etc/mock/fedora+rpmfusion_free-38-x86_64.cfg
index 57c8b9c..4e56f4c 100644
--- a/etc/mock/fedora+rpmfusion_free-38-x86_64.cfg
+++ b/etc/mock/fedora+rpmfusion_free-38-x86_64.cfg
@@ -1,2 +1,2 @@
 include('fedora-38-x86_64.cfg')
-include('templates/rpmfusion_free-branched.tpl')
+include('templates/rpmfusion_free-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_nonfree-38-aarch64.cfg b/etc/mock/fedora+rpmfusion_nonfree-38-aarch64.cfg
index 4fec904..070929e 100644
--- a/etc/mock/fedora+rpmfusion_nonfree-38-aarch64.cfg
+++ b/etc/mock/fedora+rpmfusion_nonfree-38-aarch64.cfg
@@ -1,2 +1,2 @@
 include('fedora+rpmfusion_free-38-aarch64.cfg')
-include('templates/rpmfusion_nonfree-branched.tpl')
+include('templates/rpmfusion_nonfree-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_nonfree-38-i386.cfg b/etc/mock/fedora+rpmfusion_nonfree-38-i386.cfg
index 8a1dc7a..9cc5c6c 100644
--- a/etc/mock/fedora+rpmfusion_nonfree-38-i386.cfg
+++ b/etc/mock/fedora+rpmfusion_nonfree-38-i386.cfg
@@ -1,2 +1,2 @@
 include('fedora+rpmfusion_free-38-i386.cfg')
-include('templates/rpmfusion_nonfree-branched.tpl')
+include('templates/rpmfusion_nonfree-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_nonfree-38-ppc64le.cfg b/etc/mock/fedora+rpmfusion_nonfree-38-ppc64le.cfg
index 4b68487..973a5e5 100644
--- a/etc/mock/fedora+rpmfusion_nonfree-38-ppc64le.cfg
+++ b/etc/mock/fedora+rpmfusion_nonfree-38-ppc64le.cfg
@@ -1,2 +1,2 @@
 include('fedora+rpmfusion_free-38-ppc64le.cfg')
-include('templates/rpmfusion_nonfree-branched.tpl')
+include('templates/rpmfusion_nonfree-stable.tpl')
diff --git a/etc/mock/fedora+rpmfusion_nonfree-38-x86_64.cfg b/etc/mock/fedora+rpmfusion_nonfree-38-x86_64.cfg
index 728aa6b..950a4e5 100644
--- a/etc/mock/fedora+rpmfusion_nonfree-38-x86_64.cfg
+++ b/etc/mock/fedora+rpmfusion_nonfree-38-x86_64.cfg
@@ -1,2 +1,2 @@
 include('fedora+rpmfusion_free-38-x86_64.cfg')
-include('templates/rpmfusion_nonfree-branched.tpl')
+include('templates/rpmfusion_nonfree-stable.tpl')
diff --git a/round.sh b/round.sh
index ee58c3b..2ff1d7b 100755
--- a/round.sh
+++ b/round.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 ARCHES="i386 x86_64 aarch64 armhfp ppc64le"
-FVERSION="35 36 37"
-BRANCHED="38"
+FVERSION="35 36 37 38"
+BRANCHED=""
 RAWHIDE="39"
 REPOS="rpmfusion_free rpmfusion_nonfree"
 etc_mock=../mock/mock-core-configs/etc/mock