diff --git a/SPECS/mariner-release/mariner-release.spec b/SPECS/mariner-release/mariner-release.spec
index 4b96b7a1eb..47a71df58f 100644
--- a/SPECS/mariner-release/mariner-release.spec
+++ b/SPECS/mariner-release/mariner-release.spec
@@ -1,7 +1,7 @@
 Summary:        CBL-Mariner release files
 Name:           mariner-release
 Version:        2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -34,7 +34,7 @@ cat > %{buildroot}/%{_libdir}/os-release << EOF
 NAME="Common Base Linux Mariner"
 VERSION="%{mariner_release_version}"
 ID=mariner
-VERSION_ID=$version_id
+VERSION_ID="$version_id"
 PRETTY_NAME="CBL-Mariner/Linux"
 ANSI_COLOR="1;34"
 HOME_URL="%{url}"
@@ -62,6 +62,9 @@ EOF
 %config(noreplace) %{_sysconfdir}/issue.net
 
 %changelog
+* Thu Feb 24 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0-6
+- Surrounding 'VERSION_ID' inside 'os-release' with double quotes.
+
 * Sun Feb 06 2022 Jon Slobodzian <joslobo@microsoft.com> - 2.0-5
 - Updating version for Preview D-Release
 
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
index 660b1bae91..dc55524037 100644
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -62,7 +62,7 @@ findutils-lang-4.8.0-2.cm2.aarch64.rpm
 gettext-0.21-2.cm2.aarch64.rpm
 gzip-1.11-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
-mariner-release-2.0-5.cm2.noarch.rpm
+mariner-release-2.0-6.cm2.noarch.rpm
 patch-2.7.6-7.cm2.aarch64.rpm
 util-linux-2.37.2-2.cm2.aarch64.rpm
 util-linux-devel-2.37.2-2.cm2.aarch64.rpm
diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
index 0d21462eeb..6cf0a33472 100644
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -62,7 +62,7 @@ findutils-lang-4.8.0-2.cm2.x86_64.rpm
 gettext-0.21-2.cm2.x86_64.rpm
 gzip-1.11-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
-mariner-release-2.0-5.cm2.noarch.rpm
+mariner-release-2.0-6.cm2.noarch.rpm
 patch-2.7.6-7.cm2.x86_64.rpm
 util-linux-2.37.2-2.cm2.x86_64.rpm
 util-linux-devel-2.37.2-2.cm2.x86_64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
index 72c4cd9c26..79755b1cfe 100644
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -216,7 +216,7 @@ m4-debuginfo-1.4.19-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
 make-debuginfo-4.3-2.cm2.aarch64.rpm
 mariner-check-macros-2.0-12.cm2.noarch.rpm
-mariner-release-2.0-5.cm2.noarch.rpm
+mariner-release-2.0-6.cm2.noarch.rpm
 mariner-repos-2.0-4.cm2.noarch.rpm
 mariner-repos-debuginfo-2.0-4.cm2.noarch.rpm
 mariner-repos-debuginfo-preview-2.0-4.cm2.noarch.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
index 9cdfe3bf9c..bc91f80ec0 100644
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -216,7 +216,7 @@ m4-debuginfo-1.4.19-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
 make-debuginfo-4.3-2.cm2.x86_64.rpm
 mariner-check-macros-2.0-12.cm2.noarch.rpm
-mariner-release-2.0-5.cm2.noarch.rpm
+mariner-release-2.0-6.cm2.noarch.rpm
 mariner-repos-2.0-4.cm2.noarch.rpm
 mariner-repos-debuginfo-2.0-4.cm2.noarch.rpm
 mariner-repos-debuginfo-preview-2.0-4.cm2.noarch.rpm