diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml
index 4382ad4998..54b62fbde3 100644
--- a/ci/pipelines/builder.yml
+++ b/ci/pipelines/builder.yml
@@ -75,7 +75,7 @@ jobs:
         build: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
         build_args_file: docker-build-args/docker-build-args.json
         build_args:
-          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os @)
+          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
           OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
           OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
       get_params:
@@ -90,21 +90,21 @@ jobs:
       - get: os-image-stemcell-builder-registry-image
       - get: bosh-linux-stemcell-builder
         resource: bosh-linux-stemcell-builder
-      - get: (@= data.values.stemcell_details.os @)-usn
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn
         version: every
         trigger: true
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       - get: usn-log
       - get: high-critical-unfound-usns
     - task: check-if-usn-is-in-github
       file: bosh-stemcells-ci/ci/tasks/check-if-usn-is-in-github.yml
       image: os-image-stemcell-builder-registry-image
       input_mapping:
-        usn: (@= data.values.stemcell_details.os @)-usn
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn: (@= data.values.stemcell_details.os_short_name @)-usn
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         unfound-usns: high-critical-unfound-usns
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - put: high-critical-unfound-usns
       params:
         file: updated-unfound-usns/usns.json
@@ -115,11 +115,11 @@ jobs:
         image: os-image-stemcell-builder-registry-image
         input_mapping:
           usns: found-usns
-          usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+          usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         params:
-          OS: (@= data.values.stemcell_details.os @)
+          OS: (@= data.values.stemcell_details.os_short_name @)
         vars:
-          image_os_tag: (@= data.values.stemcell_details.os @)
+          image_os_tag: (@= data.values.stemcell_details.os_short_name @)
         on_success:
           in_parallel:
             steps:
@@ -150,7 +150,7 @@ jobs:
         trigger: true
         passed:
           - process-high-critical-cves
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         passed:
           - process-high-critical-cves
     - task: check-usn-packages
@@ -158,11 +158,11 @@ jobs:
       image: os-image-stemcell-builder-registry-image
       input_mapping:
         usn-log-in: usn-log
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       params:
-        OS: (@= data.values.stemcell_details.os @)
+        OS: (@= data.values.stemcell_details.os_short_name @)
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - task: write-message
       file: bosh-stemcells-ci/ci/tasks/write-bump-message.yml
       image: bosh-integration-image
@@ -182,21 +182,21 @@ jobs:
       - get: os-image-stemcell-builder-registry-image
       - get: bosh-linux-stemcell-builder
         resource: bosh-linux-stemcell-builder
-      - get: (@= data.values.stemcell_details.os @)-usn-low-medium
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
         version: every
         trigger: true
       - get: usn-log
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       - get: low-medium-unfound-usns
     - task: check-if-usn-is-in-github
       file: bosh-stemcells-ci/ci/tasks/check-if-usn-is-in-github.yml
       image: os-image-stemcell-builder-registry-image
       input_mapping:
-        usn: (@= data.values.stemcell_details.os @)-usn-low-medium
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         unfound-usns: low-medium-unfound-usns
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - put: low-medium-unfound-usns
       params:
         file: updated-unfound-usns/usns.json
@@ -207,11 +207,11 @@ jobs:
         image: os-image-stemcell-builder-registry-image
         input_mapping:
           usns: found-usns
-          usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+          usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         params:
-          OS: (@= data.values.stemcell_details.os @)
+          OS: (@= data.values.stemcell_details.os_short_name @)
         vars:
-          image_os_tag: (@= data.values.stemcell_details.os @)
+          image_os_tag: (@= data.values.stemcell_details.os_short_name @)
         on_success:
           put: usn-log
           params:
@@ -243,10 +243,10 @@ jobs:
     image: os-image-stemcell-builder-registry-image
     params:
       OPERATING_SYSTEM_NAME: ubuntu
-      OPERATING_SYSTEM_VERSION: (@= data.values.stemcell_details.os @)
+      OPERATING_SYSTEM_VERSION: (@= data.values.stemcell_details.os_short_name @)
     privileged: true
     vars:
-      image_os_tag: (@= data.values.stemcell_details.os @)
+      image_os_tag: (@= data.values.stemcell_details.os_short_name @)
   - put: os-image-tarball
     params:
       files:
@@ -477,14 +477,14 @@ jobs:
       IAAS: #@ IAAS
       OS_NAME: ubuntu
       S3_API_ENDPOINT: storage.googleapis.com
-      OS_VERSION: (@= data.values.stemcell_details.os @)(@= FIPS @)
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)(@= FIPS @)
       STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @)
       #! AGENT_SUFFIX: ""
       #@ if/end FIPS != "":
       UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token))
     privileged: true
     vars:
-      image_os_tag: (@= data.values.stemcell_details.os @)
+      image_os_tag: (@= data.values.stemcell_details.os_short_name @)
   - in_parallel:
     - put: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)
       attempts: 3
@@ -576,7 +576,7 @@ jobs:
         file: bosh-stemcells-ci/ci/tasks/bats/iaas/gcp/prepare-bats-config.yml
         image: bosh-integration-image
         params:
-          VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os @)-go_agent
+          VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os_short_name @)-go_agent
           VARS_NETWORK_DEFAULT: bosh-concourse
           VARS_AVAILABILITY_ZONE: europe-north2-a
           VARS_MACHINE_TYPE: e2-standard-2
@@ -642,7 +642,7 @@ jobs:
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips
       FROM_INDEX: dev
       OS_NAME: ubuntu
-      OS_VERSION: (@= data.values.stemcell_details.os @)-fips
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)-fips
       TO_BUCKET_NAME: bosh-core-stemcells-candidate-fips
       TO_INDEX: candidate
       AWS_ENDPOINT: "https://storage.googleapis.com"
@@ -662,7 +662,7 @@ jobs:
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate
       FROM_INDEX: dev
       OS_NAME: ubuntu
-      OS_VERSION: (@= data.values.stemcell_details.os @)
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)
       TO_BUCKET_NAME: bosh-core-stemcells-candidate
       TO_INDEX: candidate
       AWS_ENDPOINT: "https://storage.googleapis.com"
@@ -681,7 +681,7 @@ jobs:
 
 - name: notify-of-usn
   plan:
-  - get: (@= data.values.stemcell_details.os @)-usn
+  - get: (@= data.values.stemcell_details.os_short_name @)-usn
     passed:
       - process-high-critical-cves
   - get: bosh-integration-image
@@ -693,7 +693,7 @@ jobs:
     image: bosh-integration-image
     config:
       inputs:
-      - name: (@= data.values.stemcell_details.os @)-usn
+      - name: (@= data.values.stemcell_details.os_short_name @)-usn
       outputs:
       - name: slack-message
       platform: linux
@@ -719,8 +719,8 @@ jobs:
             }
           }
           EOF
-          cat (@= data.values.stemcell_details.os @)-usn/usn.json | jq -r "$(cat template.json)" | tee slack-message/attachments
-          cat (@= data.values.stemcell_details.os @)-usn/usn.json | jq -r '"New USN for (@= data.values.stemcell_details.os @): *<\(.url)|\(.title)>*"' | tee slack-message/message
+          cat (@= data.values.stemcell_details.os_short_name @)-usn/usn.json | jq -r "$(cat template.json)" | tee slack-message/attachments
+          cat (@= data.values.stemcell_details.os_short_name @)-usn/usn.json | jq -r '"New USN for (@= data.values.stemcell_details.os_short_name @): *<\(.url)|\(.title)>*"' | tee slack-message/message
         path: /bin/bash
   - put: slack-alert
     params:
@@ -997,14 +997,14 @@ resources:
   source:
     branch: master
     uri: https://github.com/cloudfoundry/bosh-deployment
-- name: (@= data.values.stemcell_details.os @)-usn-low-medium
+- name: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
   type: usn
   source:
     os: ubuntu-(@= data.values.stemcell_details.os_version @)-lts
     priorities:
     - low
     - medium
-- name: (@= data.values.stemcell_details.os @)-usn
+- name: (@= data.values.stemcell_details.os_short_name @)-usn
   type: usn
   source:
     os: ubuntu-(@= data.values.stemcell_details.os_version @)-lts
@@ -1014,7 +1014,7 @@ resources:
     severities:
     - high
     - critical
-- name: (@= data.values.stemcell_details.os @)-usn-gh-json
+- name: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
   type: git
   source:
     branch: main
@@ -1030,7 +1030,7 @@ resources:
   type: registry-image
   source:
     repository: ubuntu
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
@@ -1038,7 +1038,7 @@ resources:
   type: registry-image
   source:
     repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
@@ -1046,7 +1046,7 @@ resources:
   type: docker-image
   source:
     repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
@@ -1055,7 +1055,7 @@ resources:
   source:
     json_key: ((gcp_json_key))
     bucket: bosh-vmware-ovftool
-    regexp: (@= data.values.stemcell_details.os @)/(.*).bundle
+    regexp: (@= data.values.stemcell_details.os_short_name @)/(.*).bundle
 
 - name: bosh-blobstore-dav
   type: s3
diff --git a/ci/pipelines/publisher.yml b/ci/pipelines/publisher.yml
index 25ee4375c9..e51f554a1d 100644
--- a/ci/pipelines/publisher.yml
+++ b/ci/pipelines/publisher.yml
@@ -19,7 +19,7 @@ params:
   ami_region: ((aws_publish_(@= region @)_region))
   ami_older_than_days: 60
   ami_keep_latest: 5
-  os_name: (@= stemcell.os @)
+  os_name: (@= data.values.stemcell_details.os_name @)
 #@ end
 #@ def cleanup_old_published_light_stemcells(name, prefix, region):
 file: bosh-stemcells-ci/ci/tasks/light-aws/cleanup-ami.yml
@@ -236,38 +236,24 @@ groups:
   - test-aws-unit
   - test-aws-drivers
   - test-aws-integration
-  #@ for stemcell in data.values.oss:
-    #@ if stemcell.build_aws:
-  - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-    #@ end
-  - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  - publish-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  #@ end
+  - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
 - name: oss
   jobs:
-  #@ for stemcell in data.values.oss:
-    #@ if stemcell.build_aws:
-  - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-    #@ end
-  - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  - publish-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  #@ end
-#@ for stemcell in data.values.oss:
-- name: (@= stemcell.os @)-(@= str(stemcell.version) @)
+  - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+- name: (@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   jobs:
-  #@ if stemcell.build_aws:
-  - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  #@ end
-  - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-  - publish-(@= stemcell.os @)-(@= str(stemcell.version) @)
-#@ end
+  - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+  - publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
 - name: cleanup-aws-light-stemcells
   jobs:
   - cleanup-light-aws-builder-test-amis
   - cleanup-published-aws-light-stemcells-older-than-three-years
-  #@ for stemcell in data.values.oss:
-  - cleanup-unpublished-(@= stemcell.os @)-aws-light-stemcells
-  #@ end
+  - cleanup-unpublished-(@= data.values.stemcell_details.os_name @)-aws-light-stemcells
 
 jobs:
 - name: cleanup-published-aws-light-stemcells-older-than-three-years
@@ -279,8 +265,7 @@ jobs:
   - get: bosh-integration-registry-image
   - #@ cleanup_old_published_light_stemcells("aws", "us", "us")
   - #@ cleanup_old_published_light_stemcells("us-goverment", "us-gov", "us-gov")
-#@ for stemcell in data.values.oss:
-- name: cleanup-unpublished-(@= stemcell.os @)-aws-light-stemcells
+- name: cleanup-unpublished-(@= data.values.stemcell_details.os_name @)-aws-light-stemcells
   serial: true
   plan:
   - get: every-week-on-monday
@@ -290,7 +275,6 @@ jobs:
   - #@ cleanup_unpublished_light_stemcells("aws", "us", "us")
   - #@ cleanup_unpublished_light_stemcells("us-goverment", "us-gov", "us-gov")
 #!- #@ cleanup_unpublished_light_stemcells("china", "cn", "cn_north")
-#@ end
 
 - name: test-aws-unit
   plan:
@@ -376,17 +360,15 @@ jobs:
       ami_keep_latest: 0
       snapshot_id: ((aws_test_snapshot_fixture_id))
 
-#@ for stemcell in data.values.oss:
-  #@ if stemcell.build_aws:
-- name: build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
+- name: build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   plan:
   - get: bosh-stemcells-ci
   - get: light-stemcell-builder-registry-image
   - get: bosh-integration-registry-image
   - in_parallel:
     - do:
-    - #@ build_light_aws_stemcell_new("build-us-gov-stemcell", stemcell.os, str(stemcell.version), "us-gov-builder-src", "us-gov-input-stemcell", "us-gov-light-stemcell", "us-gov", "us-gov", "us-gov", "", "", stemcell.efi, "")
-    - #@ build_light_aws_stemcell_new("build-us-stemcell", stemcell.os, str(stemcell.version), "us-builder-src", "us-input-stemcell", "us-light-stemcell", "us", "us", "us", "", "", stemcell.efi, '["me-central-1"]')
+    - #@ build_light_aws_stemcell_new("build-us-gov-stemcell", data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-gov-builder-src", "us-gov-input-stemcell", "us-gov-light-stemcell", "us-gov", "us-gov", "us-gov", "", "", data.values.stemcell_details.use_efi, "")
+    - #@ build_light_aws_stemcell_new("build-us-stemcell", data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version), "us-builder-src", "us-input-stemcell", "us-light-stemcell", "us", "us", "us", "", "", data.values.stemcell_details.use_efi, '["me-central-1"]')
   - file: bosh-stemcells-ci/ci/tasks/light-aws/us-gov-merge-builds.yml
     image: light-stemcell-builder-registry-image
     input_mapping:
@@ -399,15 +381,14 @@ jobs:
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'candidate (light aws): (@= stemcell.os @)/(@= str(stemcell.version) @).x'
+        message: 'candidate (light aws): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x'
       version: us-input-stemcell/.resource/version
-    put: candidate-aws-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+    put: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   serial: true
-  #@ end
 
-- name: build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
+- name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   plan:
-  - #@ get_google_light_inputs(stemcell.os, str(stemcell.version))
+  - #@ get_google_light_inputs(data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version))
   - get: light-stemcell-builder-registry-image
   - get: gce-cpi-release-registry-image
   - get: bosh-integration-registry-image
@@ -419,7 +400,7 @@ jobs:
       STEMCELL_BUCKET_PATH: bosh-gce-light-stemcells
       S3_API_ENDPOINT: storage.googleapis.com
   - params:
-      file: raw-stemcell/bosh-stemcell-*-google-kvm-(@= stemcell.os_name @)-*.tar.gz
+      file: raw-stemcell/bosh-stemcell-*-google-kvm-ubuntu-*.tar.gz
       predefined_acl: publicRead
     put: base-oss-google-ubuntu-stemcell
   - task: create-public-image
@@ -428,7 +409,7 @@ jobs:
     params:
       GCP_SERVICE_ACCOUNT_KEY: ((gcp_json_key))
       PROJECT_NAME: ((gcp_project_id))
-      EFI: #@ stemcell.efi
+      EFI: #@ data.values.stemcell_details.use_efi
 
   - #@ deploy_skeletal_google_light_stemcell("light-google-environment-oss", "((gcp_json_key))")
   - params:
@@ -437,19 +418,17 @@ jobs:
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'candidate (light google): (@= stemcell.os @)/(@= str(stemcell.version) @).x'
+        message: 'candidate (light google): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x'
       version: stemcell/.resource/version
-    put: candidate-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+    put: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   serial: true
-#@ end
 
-#@ for stemcell in data.values.oss:
-- name: publish-(@= stemcell.os @)-(@= str(stemcell.version) @)
+- name: publish-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   plan:
   - in_parallel:
     - get: bosh-stemcells-ci
     - get: bosh-linux-stemcell-builder
-      resource: bosh-linux-stemcell-builder-(@= stemcell.os @)-(@= str(stemcell.version) @).x
+      resource: bosh-linux-stemcell-builder-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @).x
     - get: bosh-integration-registry-image
     - get: os-image-stemcell-builder-registry-image
     - get: bosh-ecosystem-concourse-registry-image
@@ -457,43 +436,38 @@ jobs:
       params:
         skip_download: true
       passed:
-      #@ if stemcell.build_aws:
-      - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-      #@ end
-      - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-      resource: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
-    - get: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+      - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+      - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+      resource: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
+    - get: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
       passed:
-      #@ if stemcell.build_aws:
-      - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-      #@ end
-      - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-    #@ if/end stemcell.build_fips:
-    - get: candidate-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)
-    - get: candidate-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+      - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+      - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
+    #@ if len(data.values.stemcell_details.include_fips_iaas) > 0:
+    - get: candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)
+    #@ end
+    - get: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
       passed:
-      - build-light-google-(@= stemcell.os @)-(@= str(stemcell.version) @)
-    #@ if stemcell.build_aws:
+      - build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
     - get: candidate-aws-light-stemcell
-      resource: candidate-aws-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+      resource: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
       passed:
-      - build-light-aws-(@= stemcell.os @)-(@= str(stemcell.version) @)
-    #@ end
+      - build-light-aws-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   - file: bosh-stemcells-ci/ci/tasks/build-release-metadata.yml
     image: os-image-stemcell-builder-registry-image
     task: build-release-metadata
     params:
-      OS_NAME: (@= stemcell.os_name @)
-      OS_VERSION: (@= str(stemcell.os_version) @)
-      BRANCH: (@= stemcell.branch @)
+      OS_NAME: ubuntu
+      OS_VERSION: (@= str(data.values.stemcell_details.os_short_name) @)
+      BRANCH: (@= data.values.stemcell_details.branch @)
       KERNEL_PACKAGE: linux-generic
     input_mapping:
-      candidate-stemcell: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+      candidate-stemcell: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   - task: extract-warden-image
     image: bosh-integration-registry-image
     config:
       inputs:
-        - name: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+        - name: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
       outputs:
         - name: stemcell-image
       platform: linux
@@ -502,47 +476,46 @@ jobs:
         path: /bin/bash
         args:
           - -ce
-          - tar xvf ../candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/bosh-stemcell-*-warden-boshlite-(@= stemcell.os @)*.tgz image
-  - put: github-container-registry-(@= stemcell.os @)-stemcell
+          - tar xvf ../candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/bosh-stemcell-*-warden-boshlite-(@= data.values.stemcell_details.os_name @)*.tgz image
+  - put: github-container-registry-(@= data.values.stemcell_details.os_name @)-stemcell
     params:
       import_file: stemcell-image/image
-      tag_file: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/.resource/version
+      tag_file: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/.resource/version
       tag_as_latest: true
-  - put: published-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+  - put: published-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
     params:
       files:
-      - candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/*.tgz
+      - candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/*.tgz
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'publish (heavy): (@= stemcell.os @)/(@= str(stemcell.version) @).x'
+        message: 'publish (heavy): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x'
       rename: '{{.Version}}/stemcells.meta4'
-      version: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/.resource/version
-  #@ if stemcell.build_fips:
-  - put: published-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)
+      version: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/.resource/version
+  #@ if len(data.values.stemcell_details.include_fips_iaas) > 0 :
+  - put: published-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)
     params:
       files:
-      - candidate-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)/*.tgz
+      - candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)/*.tgz
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'publish (heavy): (@= stemcell.os @)-fips/(@= str(stemcell.version) @).x'
+        message: 'publish (heavy): (@= data.values.stemcell_details.os_name @)-fips/(@= str(data.values.stemcell_details.major_version) @).x'
       rename: '{{.Version}}/stemcells.meta4'
-      version: candidate-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)/.resource/version
+      version: candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)/.resource/version
   #@ end
-  #@ if stemcell.build_aws:
   - params:
       files:
       - candidate-aws-light-stemcell/*.tgz
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'publish (light aws): (@= stemcell.os @)/(@= str(stemcell.version) @).x'
+        message: 'publish (light aws): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x'
       rename: '{{.Version}}/stemcells.aws.meta4'
       version: candidate-aws-light-stemcell/.resource/version
-    put: published-aws-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+    put: published-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
 
-#! once we release all regions with the same account, we can unify these again
+  #! once we release all regions with the same account, we can unify these again
   - file: bosh-stemcells-ci/ci/tasks/light-aws/tag-aws-ami-light.yml
     image: bosh-ecosystem-concourse-registry-image
     task: tag-published-aws-ami-light-stemcells
@@ -565,17 +538,16 @@ jobs:
 #!      AWS_ACCESS_KEY_ID: ((aws_publish_cn_access_key))
 #!      AWS_SECRET_ACCESS_KEY: ((aws_publish_cn_secret_key))
 #!      GREP_PATTERN: grep 'cn-'
-  #@ end
   - params:
       files:
-      - candidate-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/*.tgz
+      - candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/*.tgz
       options:
         author_email: ci@localhost
         author_name: CI Bot
-        message: 'publish (light google): (@= stemcell.os @)/(@= str(stemcell.version) @).x'
+        message: 'publish (light google): (@= data.values.stemcell_details.os_name @)/(@= str(data.values.stemcell_details.major_version) @).x'
       rename: '{{.Version}}/stemcells.gcp.meta4'
-      version: candidate-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)/.resource/version
-    put: published-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+      version: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)/.resource/version
+    put: published-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   - params:
       body: release-metadata/body
       name: release-metadata/name
@@ -584,9 +556,8 @@ jobs:
   - params:
       acl: public-read
       file: usn-log/usn-log.json
-    put: usn-log-(@= stemcell.os @)-(@= str(stemcell.version) @).x
+    put: usn-log-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @).x
   serial: true
-#@ end
 
 resource_types:
 - name: metalink-repository
@@ -642,7 +613,7 @@ resources:
 - name: bosh-stemcells-ci
   type: git
   source:
-    branch: (@= stemcell.branch @)
+    branch: (@= data.values.stemcell_details.branch @)
     paths:
       - ci
     uri: https://github.com/cloudfoundry/bosh-linux-stemcell-builder.git
@@ -708,16 +679,13 @@ resources:
     regexp: bosh-stemcell-([0-9\.]+)-google-kvm-ubuntu-*-raw.tar.gz
   type: gcs-resource
 
-
-#@ for stemcell in data.values.oss:
-  #@ if stemcell.build_aws:
-- name: candidate-aws-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: candidate-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     mirror_files:
     - destination: s3://storage.googleapis.com/bosh-aws-light-stemcells-candidate/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-cpi-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//candidate-aws-light/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//candidate-aws-light/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -725,16 +693,15 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
-  #@ end
-- name: candidate-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: candidate-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     mirror_files:
     - destination: s3://storage.googleapis.com/bosh-gce-light-stemcells-candidate/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-cpi-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//candidate-gcp-light/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//candidate-gcp-light/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -742,29 +709,29 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
-- name: candidate-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.meta4'
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//candidate/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//candidate/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
-#@ if stemcell.build_fips:
-- name: candidate-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)
+#@ if len(data.values.stemcell_details.include_fips_iaas) > 0:
+- name: candidate-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.meta4'
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//candidate/(@= stemcell.os @)-fips
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//candidate/(@= data.values.stemcell_details.os_name @)-fips
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -772,25 +739,24 @@ resources:
       options:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
 #@ end
-- name: bosh-linux-stemcell-builder-(@= stemcell.os @)-(@= str(stemcell.version) @).x
+- name: bosh-linux-stemcell-builder-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @).x
   source:
-    branch: (@= stemcell.branch if hasattr(stemcell, "branch") else "{}/{}.x".format(stemcell.os, stemcell.version) @)
+    branch: (@= data.values.stemcell_details.branch @)
     private_key: ((bosh_src_key.private_key))
     uri: git@github.com:cloudfoundry/bosh-linux-stemcell-builder
   type: git
 
-- name: usn-log-(@= stemcell.os @)-(@= str(stemcell.version) @).x
+- name: usn-log-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @).x
   type: gcs-resource
   source:
     bucket: bosh-stemcell-triggers
     json_key: ((gcp_json_key))
-    versioned_file: (@= str(stemcell.branch) @)/usn-log.json
+    versioned_file: (@= data.values.stemcell_details.branch @)/usn-log.json
 
-  #@ if stemcell.build_aws:
-- name: published-aws-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: published-aws-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.aws.meta4'
@@ -798,7 +764,7 @@ resources:
     - destination: s3://storage.googleapis.com/bosh-aws-light-stemcells/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-cpi-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//published/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//published/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -806,11 +772,10 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
-  #@ end
 
-- name: published-google-light-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: published-google-light-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.gcp.meta4'
@@ -818,7 +783,7 @@ resources:
     - destination: s3://storage.googleapis.com/bosh-gce-light-stemcells/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-cpi-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//published/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-cpi-index.git//published/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -826,10 +791,10 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
 
-- name: published-(@= stemcell.os @)-stemcell-(@= str(stemcell.version) @)
+- name: published-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.meta4'
@@ -837,7 +802,7 @@ resources:
     - destination: s3://storage.googleapis.com/bosh-core-stemcells/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//published/(@= stemcell.os @)
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//published/(@= data.values.stemcell_details.os_name @)
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -845,10 +810,10 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
-  #@ if stemcell.build_fips:
-- name: published-(@= stemcell.os @)-fips-stemcell-(@= str(stemcell.version) @)
+  #@ if len(data.values.stemcell_details.include_fips_iaas) > 0:
+- name: published-(@= data.values.stemcell_details.os_name @)-fips-stemcell-(@= str(data.values.stemcell_details.major_version) @)
   source:
     filters:
     - repositorypath: '*/stemcells.meta4'
@@ -856,7 +821,7 @@ resources:
     - destination: s3://storage.googleapis.com/bosh-core-stemcells-fips/{{.Version}}/{{.Name}}
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key))
-    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//published/(@= stemcell.os @)-fips
+    uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//published/(@= data.values.stemcell_details.os_name @)-fips
     url_handlers:
     - include:
       - (s3|https)://.*
@@ -864,17 +829,16 @@ resources:
         access_key: ((hmac_accesskey))
         secret_key: ((hmac_secret))
       type: s3
-    version: (@= str(stemcell.version) @).x
+    version: (@= str(data.values.stemcell_details.major_version) @).x
   type: metalink-repository
   #@ end
 
-- name: github-container-registry-(@= stemcell.os @)-stemcell
+- name: github-container-registry-(@= data.values.stemcell_details.os_name @)-stemcell
   type: docker-image
   source:
-    repository: ghcr.io/cloudfoundry/(@= stemcell.os @)-stemcell
+    repository: ghcr.io/cloudfoundry/(@= data.values.stemcell_details.os_name @)-stemcell
     username: ((github_read_write_packages.username))
     password: ((github_read_write_packages.password))
-#@ end
 
 - name: bosh-integration-registry-image
   type: registry-image
diff --git a/ci/pipelines/vars.yml b/ci/pipelines/vars.yml
index b1acf198d8..c3c20cc44b 100644
--- a/ci/pipelines/vars.yml
+++ b/ci/pipelines/vars.yml
@@ -1,19 +1,13 @@
 #@data/values
 ---
-lts: []
-
-oss:
-  - os: ubuntu-jammy
-    version: 1
-    os_name: ubuntu
-    os_version: jammy
-    branch: "ubuntu-jammy"
-    build_aws: true
-    build_fips: true
-    efi: false
 
 stemcell_details:
-  branch: "ubuntu-jammy"
+  branch: ubuntu-jammy
+  major_version: 1
+  os_version: "22.04"
+  os_name: ubuntu-jammy
+  os_short_name: jammy
+  use_efi: false
   include_iaas: [
     {iaas: alicloud, hypervisor: kvm},
     {iaas: aws, hypervisor: xen-hvm},
@@ -28,9 +22,6 @@ stemcell_details:
     {iaas: aws, hypervisor: xen-hvm},
     {iaas: google, hypervisor: kvm},
   ]
-  os: jammy
-  os_version: "22.04"
-  os_name: ubuntu-jammy
   subnet_int: "3"
 
 blobstore_types: