diff --git a/docker-build.sh b/docker-build.sh
index 9265c8b..20f09e3 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -13,8 +13,7 @@ if [ -n "$ARCH" ]; then
 fi
 
 if [ "$VERSION" == "snapshot" ]; then
-    # backwards compatibility. New setups should use snapshot instead
-    docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:$TARGET-master"
+    docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:$TARGET-$BRANCH"
 
     if [ -n "$ARCH" ]; then
         docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:$ARCH"
@@ -22,9 +21,7 @@ if [ "$VERSION" == "snapshot" ]; then
     docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:$TARGET"
 
     if [ "$TARGET" == "x86-64" ]; then
-        # backwards compatibility. New setups should use snapshot instead
-        docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:master"
-
+        docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:$BRANCH"
         docker tag "$DOCKER_IMAGE:$TARGET-$VERSION" "$DOCKER_IMAGE:latest"
     fi
 fi
diff --git a/docker-imagebuilder.sh b/docker-imagebuilder.sh
index 76c7cc5..92c39ab 100755
--- a/docker-imagebuilder.sh
+++ b/docker-imagebuilder.sh
@@ -8,6 +8,12 @@ export VERSION="${VERSION:-snapshot}"
 export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-imagebuilder}"
 export DOWNLOAD_FILE="openwrt-imagebuilder*x86_64.tar.xz"
 
+if [ "$VERSION" = "snapshot" ]; then
+	export BRANCH="master"
+else
+	export BRANCH="openwrt-${VERSION%.*}"
+fi
+
 if [ "$VERSION" == "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
 else
diff --git a/docker-rootfs.sh b/docker-rootfs.sh
index 749ed5b..21d4672 100755
--- a/docker-rootfs.sh
+++ b/docker-rootfs.sh
@@ -9,6 +9,12 @@ export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-rootfs}"
 export DOWNLOAD_FILE="openwrt-*-rootfs.tar.gz"
 export DOCKERFILE="Dockerfile.rootfs"
 
+if [ "$VERSION" = "snapshot" ]; then
+	export BRANCH="master"
+else
+	export BRANCH="openwrt-${VERSION%.*}"
+fi
+
 if [ "$VERSION" = "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
 else
diff --git a/docker-sdk.sh b/docker-sdk.sh
index d48c2b4..653051e 100755
--- a/docker-sdk.sh
+++ b/docker-sdk.sh
@@ -12,6 +12,12 @@ export VERSION="${VERSION:-snapshot}"
 export DOCKER_IMAGE="${DOCKER_IMAGE:-openwrt-sdk}"
 export DOWNLOAD_FILE="openwrt-sdk-*.Linux-x86_64.tar.xz"
 
+if [ "$VERSION" = "snapshot" ]; then
+	export BRANCH="master"
+else
+	export BRANCH="openwrt-${VERSION%.*}"
+fi
+
 if [ "$VERSION" == "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
 else
@@ -30,14 +36,11 @@ cp "$DOCKERFILE" ./build/
 docker build -t "$DOCKER_IMAGE:$ARCH-$VERSION" -f "./build/$DOCKERFILE" ./build
 
 if [ "$VERSION" == "snapshot" ]; then
-    # backwards compatibility. New setups should use snapshot instead
-    docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:$ARCH-master"
+    docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:$ARCH-$BRANCH"
 
     docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:$ARCH"
     if [ "$ARCH" == "x86_64" ]; then
-        # backwards compatibility. New setups should use snapshot instead
-        docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:master"
-
+        docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:$BRANCH"
         docker tag "$DOCKER_IMAGE:$ARCH-$VERSION" "$DOCKER_IMAGE:latest"
     fi
 fi
diff --git a/generate_targets.sh b/generate_targets.sh
index 8628b1d..e0cd66d 100644
--- a/generate_targets.sh
+++ b/generate_targets.sh
@@ -17,6 +17,7 @@ gen_targets_sdk() {
 deploy-sdk_$ARCH:
   extends: .deploy-sdk
   variables:
+    BRANCH: \"$BRANCH\"
     VERSION: \"$VERSION\"
     TARGETS: \"$TARGETS\""
 	done
@@ -29,6 +30,7 @@ gen_targets_imagebuilder() {
 deploy-imagebuilder_$TARGET:
   extends: .deploy-imagebuilder
   variables:
+    BRANCH: \"$BRANCH\"
     VERSION: \"$VERSION\""
 	done
 }