diff --git a/config/sources/families/jetson-nano.conf b/config/sources/families/jetson-nano.conf
index 07bad42d3..e3c2a140b 100644
--- a/config/sources/families/jetson-nano.conf
+++ b/config/sources/families/jetson-nano.conf
@@ -21,7 +21,7 @@ case $BRANCH in
 	;;
 
 	current)
-		KERNELBRANCH="branch:linux-5.17.y"
+		KERNELBRANCH="branch:linux-5.18.y"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
@@ -29,7 +29,8 @@ case $BRANCH in
 	;;
 
 	edge)
-		KERNELBRANCH="branch:linux-5.18.y"
+#		KERNELBRANCH="branch:linux-5.18.y"
+		KERNELBRANCH="tag:v5.19-rc6"
 		KERNELPATCHDIR='media-'$BRANCH
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
diff --git a/config/sources/families/media.conf b/config/sources/families/media.conf
index ea0479451..8ae4bc8fb 100644
--- a/config/sources/families/media.conf
+++ b/config/sources/families/media.conf
@@ -9,7 +9,7 @@ elif [[ $BOARD == quartz64a ]]; then
 	BOOTBRANCH='branch:rk35xx'
 	BOOTPATCHDIR="u-boot-station-p2"
 else
-	BOOTBRANCH="tag:v2022.07-rc6"
+	BOOTBRANCH="tag:v2022.07"
 	BOOTPATCHDIR="u-boot-media"
 fi
 
@@ -60,7 +60,7 @@ case $BRANCH in
 
 	edge)
 		KERNELPATCHDIR='media-'$BRANCH
-		KERNELBRANCH="tag:v5.19-rc5"
+		KERNELBRANCH="tag:v5.19-rc6"
 		LINUXFAMILY=media
 		LINUXCONFIG='linux-media-'$BRANCH
 		SKIP_BOOTSPLASH="yes"