diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml
index 9e4e6e69de..ebf1f8937f 100644
--- a/ci/pipelines/builder.yml
+++ b/ci/pipelines/builder.yml
@@ -358,7 +358,7 @@ jobs:
           GCP_ZONE: europe-north2-a
           GCP_PREEMPTIBLE: true
           GCP_NETWORK_NAME: bosh-concourse
-          GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
+          GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
           GCP_JSON_KEY: ((gcp_json_key))
           INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
           INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -425,7 +425,7 @@ jobs:
 #!          GCP_PROJECT_ID: ((gcp_project_id))
 #!          GCP_ZONE: europe-north2-a
 #!          GCP_NETWORK_NAME: ipv6-test
-#!          GCP_SUBNET_NAME: bosh-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
+#!          GCP_SUBNET_NAME: stemcell-builder-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
 #!          GCP_JSON_KEY: ((gcp_json_key))
 #!          INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
 #!          INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -561,7 +561,7 @@ jobs:
           GCP_JSON_KEY: ((gcp_json_key))
           GCP_PROJECT_ID: ((gcp_project_id))
           GCP_ZONE: europe-north2-a
-          GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
+          GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
           TAG: test-stemcells-bats
       - task: deploy-director
         file: bosh-stemcells-ci/ci/tasks/gcp/deploy-director.yml
@@ -571,7 +571,7 @@ jobs:
           GCP_ZONE: europe-north2-a
           GCP_PREEMPTIBLE: true
           GCP_NETWORK_NAME: bosh-concourse
-          GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
+          GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
           GCP_JSON_KEY: ((gcp_json_key))
           INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).66
           INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -588,7 +588,7 @@ jobs:
           VARS_MACHINE_TYPE: e2-standard-2
           VARS_ZONE: europe-north2-a
           VARS_PREEMPTIBLE: true
-          VARS_SUBNETWORK_DEFAULT: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
+          VARS_SUBNETWORK_DEFAULT: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
           VARS_CIDR_DEFAULT: "10.100.(@= data.values.stemcell_details.subnet_int @).0/24"
           VARS_RESERVED_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).2 - 10.100.(@= data.values.stemcell_details.subnet_int @).129, 10.100.(@= data.values.stemcell_details.subnet_int @).190 - 10.100.(@= data.values.stemcell_details.subnet_int @).254'
           VARS_STATIC_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).130 - 10.100.(@= data.values.stemcell_details.subnet_int @).155'
@@ -1060,6 +1060,7 @@ resources:
     branch: (@= data.values.stemcell_details.branch @)
     paths:
       - ci
+      - .ruby-version
     uri: https://github.com/cloudfoundry/bosh-linux-stemcell-builder.git
 
 - name: bats
diff --git a/ci/pipelines/vars.yml b/ci/pipelines/vars.yml
index 854c4077ef..3f7284150c 100644
--- a/ci/pipelines/vars.yml
+++ b/ci/pipelines/vars.yml
@@ -6,6 +6,7 @@ stemcell_details:
   os_version: "24.04"
   os_name: ubuntu-noble
   os_short_name: noble
+  subnet_int: "24" #! use last two digits of release year: ex 2010 -> 10
   use_efi: true
   include_iaas: [
     {iaas: alicloud, hypervisor: kvm},
@@ -17,7 +18,6 @@ stemcell_details:
     {iaas: warden, hypervisor: boshlite}
   ]
   include_fips_iaas: []
-  subnet_int: "0"
 
 blobstore_types:
 - dav
diff --git a/ci/tasks/build-docker-args.sh b/ci/tasks/build-docker-args.sh
index 9e7da2b8b9..beeb9ea540 100755
--- a/ci/tasks/build-docker-args.sh
+++ b/ci/tasks/build-docker-args.sh
@@ -28,7 +28,7 @@ yq_cli_url="$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest
 ruby_install_url="$(curl -s https://api.github.com/repos/postmodern/ruby-install/releases/latest \
                     | jq -r '.assets[] | select(.name | endswith ("tar.gz")) | .browser_download_url')"
 
-ruby_version="$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/.ruby-version")"
+ruby_version="$(cat "${REPO_ROOT}/.ruby-version")"
 gem_home="/usr/local/bundle"
 
 cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.json"