diff --git a/.github/workflows/delete-untagged-packages.yml b/.github/workflows/delete-untagged-packages.yml
index 42e9fd5a..cdf0cb18 100644
--- a/.github/workflows/delete-untagged-packages.yml
+++ b/.github/workflows/delete-untagged-packages.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   delete-untagged-packages:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Delete untagged dev-cache packages
         uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0
diff --git a/copier.yaml b/copier.yaml
index 40cdacf1..3933d8b9 100644
--- a/copier.yaml
+++ b/copier.yaml
@@ -127,10 +127,10 @@ coverage_threshold:
   type: int
   validator: "{% if not 0 <= coverage_threshold <= 100 %}Test Coverage threshold should be between 0 and 100{% endif %}"
 platforms:
-  default: ["macos", "ubuntu", "windows"]
+  default: ["macos", "linux", "windows"]
   choices:
     - macos
-    - ubuntu
+    - linux
     - windows
   help: "Set the supported platforms for the project:"
   multiselect: true
diff --git a/includes/copier-answers-sample.yml b/includes/copier-answers-sample.yml
index 5defe9c2..3ad46a4a 100644
--- a/includes/copier-answers-sample.yml
+++ b/includes/copier-answers-sample.yml
@@ -13,7 +13,7 @@ organization_name: Serious Scaffold
 package_name: ss-python
 platforms:
     - macos
-    - ubuntu
+    - linux
     - windows
 project_description:
     A Python Project Template for Long-Term Maintainability.
diff --git a/pyproject.toml b/pyproject.toml
index a3546181..662ab0f1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,9 @@ requires-python = ">=3.9"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
diff --git a/template/pyproject.toml.jinja b/template/pyproject.toml.jinja
index 7366a990..6e93909f 100644
--- a/template/pyproject.toml.jinja
+++ b/template/pyproject.toml.jinja
@@ -48,7 +48,15 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
 {% endif %}
     "License :: OSI Approved :: {{ copyright_license }}",
-    "Operating System :: OS Independent",
+{% if "macos" in platforms %}
+    "Operating System :: MacOS :: MacOS X",
+{% endif %}
+{% if "windows" in platforms %}
+    "Operating System :: Microsoft :: Windows",
+{% endif %}
+{% if "linux" in platforms %}
+    "Operating System :: POSIX :: Linux",
+{% endif %}
     "Programming Language :: Python :: 3 :: Only",
 {% if version_between("3.9", min_py, max_py) %}
     "Programming Language :: Python :: 3.9",
diff --git a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja
index 7317698d..5dbf2293 100644
--- a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja	
+++ b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/ci.yml.jinja	
@@ -40,7 +40,7 @@ jobs:
           # renovate: github-runner
           - macos-14
 {% endif %}
-{% if "ubuntu" in platforms %}
+{% if "linux" in platforms %}
           # renovate: github-runner
           - ubuntu-24.04
 {% endif %}
diff --git a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja
index 6b077fb8..20c74845 100644
--- a/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja	
+++ b/template/{% if repo_platform == 'github' %}.github{% endif %}/workflows/delete-untagged-packages.yml.jinja	
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   delete-untagged-packages:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Delete untagged dev-cache packages
         uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0