diff --git a/VERSION b/VERSION
index a6e7bcb30..c945ef144 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.17
+2.0.18
diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md
index 07144d5ea..a80d4db7d 100644
--- a/docs/changelogs/CHANGELOG-2.0.md
+++ b/docs/changelogs/CHANGELOG-2.0.md
@@ -1,6 +1,12 @@
 <!-- markdownlint-disable-file no-duplicate-heading -->
 # Changelog 2.0
 
+## [2.0.18] 2025-01-07
+
+### Fixed
+
+- [#3478](https://github.com/hitachienergy/epiphany/issues/3478) - AlmaLinux 8.5 OS image no longer available in Azure
+
 ## [2.0.17] 2024-11-15
 
 ### Fixed
diff --git a/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml b/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml
index 941be3549..5d4c55c4c 100644
--- a/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml
+++ b/schema/azure/defaults/infrastructure/cloud-os-image-defaults.yml
@@ -5,13 +5,9 @@ name: default
 specification:
   almalinux-8-x86_64:
     publisher: almalinux
-    offer: almalinux
-    sku: 8_5-gen2
-    version: '8.5.20220311'  # offer with PlanId: 8_4 was removed from the marketplace for new purchase
-    plan:
-      name: 8_5-gen2
-      product: almalinux
-      publisher: almalinux
+    offer: almalinux-x86_64
+    sku: 8-gen2
+    version: '8.8.2023072701'  # offers with plan ids: 8_4 and 8_5-gen2 have been removed from the marketplace for new purchases
   rhel-8-x86_64:
     publisher: RedHat
     offer: rhel-raw