diff --git a/.gitlab/ci/base.yml b/.gitlab/ci/base.yml
index acf9b1f..08940ba 100644
--- a/.gitlab/ci/base.yml
+++ b/.gitlab/ci/base.yml
@@ -19,10 +19,8 @@
 
 generate-targets:
   stage: generate_targets
-  script: |
-    git clone --depth 1 --branch "$BRANCH" https://github.com/openwrt/openwrt.git
-    cd openwrt/
-    bash ../generate_targets.sh
+  script:
+    - bash ./generate_targets.sh
   artifacts:
     paths:
       - targets.yml
diff --git a/docker-imagebuilder.sh b/docker-imagebuilder.sh
index d765aef..76c7cc5 100755
--- a/docker-imagebuilder.sh
+++ b/docker-imagebuilder.sh
@@ -10,10 +10,8 @@ export DOWNLOAD_FILE="openwrt-imagebuilder*x86_64.tar.xz"
 
 if [ "$VERSION" == "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="master"
 else
 	DOWNLOAD_PATH="releases/$VERSION/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="openwrt-$VERSION"
 fi
 export DOWNLOAD_PATH
 
diff --git a/docker-rootfs.sh b/docker-rootfs.sh
index 082bb7b..749ed5b 100755
--- a/docker-rootfs.sh
+++ b/docker-rootfs.sh
@@ -11,10 +11,8 @@ export DOCKERFILE="Dockerfile.rootfs"
 
 if [ "$VERSION" = "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="master"
 else
 	DOWNLOAD_PATH="releases/$VERSION/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="openwrt-$VERSION"
 fi
 export DOWNLOAD_PATH
 
diff --git a/docker-sdk.sh b/docker-sdk.sh
index 2483299..f95aad8 100755
--- a/docker-sdk.sh
+++ b/docker-sdk.sh
@@ -12,10 +12,8 @@ export DOWNLOAD_FILE="openwrt-sdk-*.Linux-x86_64.tar.xz"
 
 if [ "$VERSION" == "snapshot" ]; then
 	DOWNLOAD_PATH="snapshots/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="master"
 else
 	DOWNLOAD_PATH="releases/$VERSION/targets/$(echo "$TARGET" | tr '-' '/')"
-	export BRANCH="openwrt-$VERSION"
 fi
 export DOWNLOAD_PATH
 
diff --git a/generate_targets.sh b/generate_targets.sh
index e45533d..fdeacd2 100644
--- a/generate_targets.sh
+++ b/generate_targets.sh
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+if [ "$VERSION" = "snapshot" ]; then
+	export BRANCH="master"
+else
+	export BRANCH="openwrt-$VERSION"
+fi
+
+git clone --depth 1 --branch "$BRANCH" https://github.com/openwrt/openwrt.git
+cd openwrt/ || exit 1
+
 gen_targets_sdk() {
 	perl ./scripts/dump-target-info.pl architectures | while read -r LINE; do
 		ARCH=$(echo "$LINE" | cut -d ' ' -f 1)