diff --git a/roles/osh-run-script-set/defaults/main.yaml b/roles/osh-run-script-set/defaults/main.yaml
index 8de078a0b..856388323 100644
--- a/roles/osh-run-script-set/defaults/main.yaml
+++ b/roles/osh-run-script-set/defaults/main.yaml
@@ -13,6 +13,6 @@
 ---
 osh_params:
   container_distro_name: ubuntu
-  container_distro_version: xenial
+  container_distro_version: focal
   # feature_gates:
 ...
diff --git a/roles/osh-run-script/defaults/main.yaml b/roles/osh-run-script/defaults/main.yaml
index 8de078a0b..856388323 100644
--- a/roles/osh-run-script/defaults/main.yaml
+++ b/roles/osh-run-script/defaults/main.yaml
@@ -13,6 +13,6 @@
 ---
 osh_params:
   container_distro_name: ubuntu
-  container_distro_version: xenial
+  container_distro_version: focal
   # feature_gates:
 ...
diff --git a/tools/deployment/common/get-values-overrides.sh b/tools/deployment/common/get-values-overrides.sh
index 7b285ab22..d46816eb9 100755
--- a/tools/deployment/common/get-values-overrides.sh
+++ b/tools/deployment/common/get-values-overrides.sh
@@ -18,7 +18,7 @@ HELM_CHART="$1"
 
 : "${HELM_CHART_ROOT_PATH:="../openstack-helm-infra"}"
 : "${CONTAINER_DISTRO_NAME:="ubuntu"}"
-: "${CONTAINER_DISTRO_VERSION:="xenial"}"
+: "${CONTAINER_DISTRO_VERSION:="focal"}"
 : "${FEATURE_GATES:="apparmor"}"
 OSH_INFRA_FEATURE_MIX="${FEATURE_GATES},${CONTAINER_DISTRO_NAME}_${CONTAINER_DISTRO_VERSION},${CONTAINER_DISTRO_NAME}"