diff --git a/Fedora.kiwi b/Fedora.kiwi
index 393d333..9ae4da7 100644
--- a/Fedora.kiwi
+++ b/Fedora.kiwi
@@ -7,12 +7,12 @@
 		<specification>Fedora Linux</specification>
 	</description>
 	<preferences>
-		<version>Rawhide</version>
+		<version>41</version>
 		<packagemanager>dnf5</packagemanager>
 		<locale>en_US</locale>
 		<keytable>us</keytable>
 		<timezone>UTC</timezone>
-		<release-version>rawhide</release-version>
+		<release-version>41</release-version>
 	</preferences>
 	<include from="this://./repositories/core.xml"/>
 	<include from="this://./components/boot.xml"/>
diff --git a/README.md b/README.md
index 0b17d36..10d2a9a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This project is used to manage the Fedora KIWI image descriptions used in composing Fedora release images.
 
-The `rawhide` branch is used for Fedora Rawhide images and each release branch is used by that release.
+The `41` branch is used for Fedora 41 images.
 
 All changes should be made via the PR workflow.
 
diff --git a/repositories/core.xml b/repositories/core.xml
index 95dc008..86a91b7 120000
--- a/repositories/core.xml
+++ b/repositories/core.xml
@@ -1 +1 @@
-core-rawhide.xml
\ No newline at end of file
+core-nonrawhide.xml
\ No newline at end of file
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index 22ae0d7..b2da6f0 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -17,7 +17,7 @@
 		<type image="oci">
 			<containerconfig
 			  name="fedora"
-			  tag="rawhide"
+			  tag="41"
 			  maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
 			>
 				<subcommand execute="/bin/bash"/>
@@ -26,12 +26,12 @@
 					<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
 					<label name="org.opencontainers.image.license" value="MIT"/>
 					<label name="org.opencontainers.image.name" value="fedora"/>
-					<label name="org.opencontainers.image.version" value="rawhide"/>
+					<label name="org.opencontainers.image.version" value="41"/>
 					<!-- Legacy attributes for backward compatibility -->
 					<label name="vendor" value="Fedora Project"/>
 					<label name="license" value="MIT"/>
 					<label name="name" value="fedora"/>
-					<label name="version" value="rawhide"/>
+					<label name="version" value="41"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
@@ -47,7 +47,7 @@
 		<type image="oci">
 			<containerconfig
 			  name="fedora-minimal"
-			  tag="rawhide"
+			  tag="41"
 			  maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
 			>
 				<subcommand execute="/bin/bash"/>
@@ -56,12 +56,12 @@
 					<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
 					<label name="org.opencontainers.image.license" value="MIT"/>
 					<label name="org.opencontainers.image.name" value="fedora-minimal"/>
-					<label name="org.opencontainers.image.version" value="rawhide"/>
+					<label name="org.opencontainers.image.version" value="41"/>
 					<!-- Legacy attributes for backward compatibility -->
 					<label name="vendor" value="Fedora Project"/>
 					<label name="license" value="MIT"/>
 					<label name="name" value="fedora-minimal"/>
-					<label name="version" value="rawhide"/>
+					<label name="version" value="41"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>
@@ -77,7 +77,7 @@
 		<type image="oci">
 			<containerconfig
 			  name="fedora-init"
-			  tag="rawhide"
+			  tag="41"
 			  maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
 			>
 				<subcommand execute="/sbin/init"/>
@@ -86,12 +86,12 @@
 					<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
 					<label name="org.opencontainers.image.license" value="MIT"/>
 					<label name="org.opencontainers.image.name" value="fedora-init"/>
-					<label name="org.opencontainers.image.version" value="rawhide"/>
+					<label name="org.opencontainers.image.version" value="41"/>
 					<!-- Legacy attributes for backward compatibility -->
 					<label name="vendor" value="Fedora Project"/>
 					<label name="license" value="MIT"/>
 					<label name="name" value="fedora-init"/>
-					<label name="version" value="rawhide"/>
+					<label name="version" value="41"/>
 				</labels>
 				<stopsignal>SIGRTMIN+3</stopsignal>
 			</containerconfig>
@@ -105,7 +105,7 @@
 		<type image="oci">
 			<containerconfig
 			  name="fedora-toolbox"
-			  tag="rawhide"
+			  tag="41"
 			  maintainer="Fedora Project Contributors &lt;devel@lists.fedoraproject.org&gt;"
 			>
 				<subcommand execute="/bin/bash"/>
@@ -114,13 +114,13 @@
 					<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
 					<label name="org.opencontainers.image.license" value="MIT"/>
 					<label name="org.opencontainers.image.name" value="fedora-toolbox"/>
-					<label name="org.opencontainers.image.version" value="rawhide"/>
+					<label name="org.opencontainers.image.version" value="41"/>
 					<label name="com.github.containers.toolbox" value="true"/>
 					<!-- Legacy attributes for backward compatibility -->
 					<label name="vendor" value="Fedora Project"/>
 					<label name="license" value="MIT"/>
 					<label name="name" value="fedora-toolbox"/>
-					<label name="version" value="rawhide"/>
+					<label name="version" value="41"/>
 				</labels>
 				<environment>
 					<env name="container" value="oci"/>