diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5512673032..64274d58ff 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -116,7 +116,7 @@ jobs:
 
           # This is also done again in run-kola-tests.yaml because these changes here disappear
           source ci-automation/ci_automation_common.sh
-          source sdk_container/.repo/manifests/version.txt
+          source manifests/version.txt
 
           version="alpha-$FLATCAR_VERSION_ID"
           check_version_string "$version"
@@ -196,7 +196,7 @@ jobs:
           source ci-automation/image_changes.sh
 
           channel=alpha
-          vernum=$(source sdk_container/.repo/manifests/version.txt; echo "${FLATCAR_VERSION}")
+          vernum=$(source manifests/version.txt; echo "${FLATCAR_VERSION}")
           board="${arch}-usr"
 
           package_diff_env=(
diff --git a/.github/workflows/mantle-releases-main.yml b/.github/workflows/mantle-releases-main.yml
index a45fc0f3c2..e14f04712f 100644
--- a/.github/workflows/mantle-releases-main.yml
+++ b/.github/workflows/mantle-releases-main.yml
@@ -63,9 +63,9 @@ jobs:
           set -euo pipefail
           set -x
           commit=${{ steps.fetch-latest-mantle.outputs.COMMIT }}
-          if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" sdk_container/.repo/manifests/mantle-container; then
-            echo "ghcr.io/flatcar/mantle:git-${commit}" > sdk_container/.repo/manifests/mantle-container
-            git add sdk_container/.repo/manifests/mantle-container
+          if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" manifests/mantle-container; then
+            echo "ghcr.io/flatcar/mantle:git-${commit}" > manifests/mantle-container
+            git add manifests/mantle-container
           fi
       - name: Create pull request for branch
         if: ${{ steps.figure-out-branch.outputs.SKIP == 0 }}
diff --git a/.github/workflows/run-kola-tests.yaml b/.github/workflows/run-kola-tests.yaml
index 816ad60e0c..be33e84c7e 100644
--- a/.github/workflows/run-kola-tests.yaml
+++ b/.github/workflows/run-kola-tests.yaml
@@ -179,7 +179,7 @@ jobs:
           pushd scripts
 
           source ci-automation/ci_automation_common.sh
-          source sdk_container/.repo/manifests/version.txt
+          source manifests/version.txt
 
           version="alpha-$FLATCAR_VERSION_ID"
           check_version_string "$version"
@@ -324,7 +324,7 @@ jobs:
             done
           done
 
-          source sdk_container/.repo/manifests/version.txt
+          source manifests/version.txt
           tap_generate_report "${all_archs}"  "${FLATCAR_VERSION}" "md" "true" > test-results.md
 
           cat test-results.md >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/setup-flatcar-sdk.sh b/.github/workflows/setup-flatcar-sdk.sh
index d362ba2359..77aa15c76f 100755
--- a/.github/workflows/setup-flatcar-sdk.sh
+++ b/.github/workflows/setup-flatcar-sdk.sh
@@ -24,7 +24,7 @@ sudo apt-get install -y docker-ce docker-ce-cli containerd.io \
 pushd "${WORK_SCRIPTS_DIR}"
 
 source ci-automation/ci_automation_common.sh
-source sdk_container/.repo/manifests/version.txt
+source manifests/version.txt
 
 # run_sdk_container requires a tag to exist in the repo it resides,
 # which may not be the case for forked repos. Add some fake tag in
diff --git a/.github/workflows/update-sdk.yaml b/.github/workflows/update-sdk.yaml
index 4d8e2b7bd9..ca38417e38 100644
--- a/.github/workflows/update-sdk.yaml
+++ b/.github/workflows/update-sdk.yaml
@@ -93,7 +93,7 @@ jobs:
           set -euo pipefail
 
           source ci-automation/ci_automation_common.sh
-          source sdk_container/.repo/manifests/version.txt
+          source manifests/version.txt
 
           version="alpha-$FLATCAR_VERSION_ID"
           sdk_version="${SOURCE_SDK_VERSION:-$FLATCAR_SDK_VERSION}"
@@ -124,7 +124,7 @@ jobs:
           echo "setting sdk_version=${target_version} as a github output"
           echo "sdk_version=${target_version}" >> "$GITHUB_OUTPUT"
 
-          # This also updates sdk_container/.repo/manifests/version.txt with the new SDK version.
+          # This also updates manifests/version.txt with the new SDK version.
           ./update_sdk_container_image "${target_version}"
 
       - name: Upload the SDK container and binary packages to bincache
@@ -144,7 +144,7 @@ jobs:
           echo "    User ${BUILDCACHE_USER}" >> ~/.ssh/config
           echo "    IdentityFile ~/.ssh/bincache" >> ~/.ssh/config
 
-          source sdk_container/.repo/manifests/version.txt
+          source manifests/version.txt
           vernum="${FLATCAR_SDK_VERSION}"
           docker_vernum="$(vernum_to_docker_image_version "${vernum}")"