diff --git a/modules/bastion/cloudinit.tf b/modules/bastion/cloudinit.tf
index 8f880323..91368916 100644
--- a/modules/bastion/cloudinit.tf
+++ b/modules/bastion/cloudinit.tf
@@ -6,6 +6,15 @@ data "cloudinit_config" "bastion" {
   gzip          = true
   base64_encode = true
 
+  part {
+    content_type = "text/cloud-config"
+    # https://cloudinit.readthedocs.io/en/latest/reference/examples.html#run-commands-on-first-boot
+    content = <<-EOT
+    runcmd:
+    - dnf config-manager --disable ol8_addons --disable ol8_appstream
+    EOT
+  }
+
   part {
     content_type = "text/cloud-config"
     # https://cloudinit.readthedocs.io/en/latest/reference/modules.html#package-update-upgrade-install
diff --git a/variables-bastion.tf b/variables-bastion.tf
index 8afd289a..a88faf1f 100644
--- a/variables-bastion.tf
+++ b/variables-bastion.tf
@@ -60,7 +60,7 @@ variable "bastion_image_os" {
 }
 
 variable "bastion_image_os_version" {
-  default     = "8.7"
+  default     = "8.8"
   description = "Bastion image operating system version when bastion_image_type = 'platform'."
   type        = string
 }