diff --git a/SPECS-EXTENDED/authd/auth.socket b/SPECS/authd/auth.socket
similarity index 100%
rename from SPECS-EXTENDED/authd/auth.socket
rename to SPECS/authd/auth.socket
diff --git a/SPECS-EXTENDED/authd/auth@.service b/SPECS/authd/auth@.service
similarity index 100%
rename from SPECS-EXTENDED/authd/auth@.service
rename to SPECS/authd/auth@.service
diff --git a/SPECS-EXTENDED/authd/authd.signatures.json b/SPECS/authd/authd.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/authd/authd.signatures.json
rename to SPECS/authd/authd.signatures.json
diff --git a/SPECS-EXTENDED/authd/authd.spec b/SPECS/authd/authd.spec
similarity index 91%
rename from SPECS-EXTENDED/authd/authd.spec
rename to SPECS/authd/authd.spec
index 7cb3b83ceb0..8a20d650e8c 100644
--- a/SPECS-EXTENDED/authd/authd.spec
+++ b/SPECS/authd/authd.spec
@@ -5,7 +5,7 @@ Distribution:   Mariner
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: https://github.com/InfrastructureServices/authd
 Obsoletes: pidentd < 3.2
@@ -14,8 +14,11 @@ Requires(post): openssl
 Source0: https://github.com/InfrastructureServices/authd/releases/download/v1.4.4/authd-1.4.4.tar.gz
 Source1: auth.socket
 Source2: auth@.service
-BuildRequires:  gcc
-BuildRequires: openssl-devel gettext help2man systemd-units
+BuildRequires: gcc
+BuildRequires: openssl-devel 
+BuildRequires: gettext 
+BuildRequires: help2man 
+BuildRequires: systemd-units
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -74,6 +77,10 @@ chmod o-rw %{_sysconfdir}/ident.key
 %{_unitdir}/*
 
 %changelog
+* Thu Jul 28 2022 Henry Li <lihl@microsoft.com> - 1.4.4-6
+- Fix spec formatting
+- License Verified
+
 * Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.4.4-5
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Making binaries paths compatible with CBL-Mariner's paths.
diff --git a/SPECS/ca-certificates/ca-certificates.signatures.json b/SPECS/ca-certificates/ca-certificates.signatures.json
index 25d2c3fdd7c..1c01a1f4fa2 100644
--- a/SPECS/ca-certificates/ca-certificates.signatures.json
+++ b/SPECS/ca-certificates/ca-certificates.signatures.json
@@ -11,7 +11,7 @@
   "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
   "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
   "certdata.base.txt": "76c4cd1860b9a6f6ee9c2a0dcddcef46f65950b7ec12d2a7eeabeedca4e379f9",
-  "certdata.microsoft.txt": "32789389efd31aa04d9f482bd1132a0661c249fcd5eb9ec92b02ddca6ed35a7d",
+  "certdata.microsoft.txt": "18075612875845029e53c423799e48f974a4e95aaa7b0e4a909ee25094120708",
   "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
   "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
   "trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",
diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec
index e379e5666a7..a69ef8c34cb 100644
--- a/SPECS/ca-certificates/ca-certificates.spec
+++ b/SPECS/ca-certificates/ca-certificates.spec
@@ -45,7 +45,7 @@ Name:           ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -318,6 +318,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{_bindir}/bundle2pem.sh
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <cblmargh@microsoft.com> - 2.0.0-7
+- Updating Microsoft trusted root CAs.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-6
 - Bumping release to match with "prebuilt-*" packages.
 
diff --git a/SPECS/ca-certificates/certdata.microsoft.txt b/SPECS/ca-certificates/certdata.microsoft.txt
index a89953d8757..7e6c844b7b2 100644
--- a/SPECS/ca-certificates/certdata.microsoft.txt
+++ b/SPECS/ca-certificates/certdata.microsoft.txt
@@ -1,4 +1,4 @@
-# Release: May 2022
+# Release: June 2022
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -38930,3 +38930,306 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+
+#
+# Certificate "Visa Public RSA Root CA"
+#
+# Issuer: CN=Visa Public RSA Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Serial Number:51:3e:96:00:00:00:db:44:27:ee:ac:e0:be:e1:48
+# Subject: CN=Visa Public RSA Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Not Valid Before: Tue Mar 16 00:00:00 2021
+# Not Valid After : Fri Mar 15 00:00:00 2041
+# Fingerprint (SHA-256): 07:CD:9A:A9:06:4A:9B:94:C6:AE:F8:FB:78:4C:1B:BC:1B:ED:A0:8A:CB:E8:68:78:D7:81:A3:91:67:62:6C:F8
+# Fingerprint (SHA1): 82:EF:4C:64:F0:57:CA:00:38:F0:DB:5B:76:C2:4B:65:4D:7C:DA:78
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Visa Public RSA Root CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\122\123\101\040\122\157\157\164\040\103
+\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\122\123\101\040\122\157\157\164\040\103
+\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\017\121\076\226\000\000\000\333\104\047\356\254\340\276\341
+\110
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\251\060\202\003\221\240\003\002\001\002\002\017\121
+\076\226\000\000\000\333\104\047\356\254\340\276\341\110\060\015
+\006\011\052\206\110\206\367\015\001\001\013\005\000\060\157\061
+\013\060\011\006\003\125\004\006\023\002\125\123\061\015\060\013
+\006\003\125\004\012\014\004\126\111\123\101\061\057\060\055\006
+\003\125\004\013\014\046\126\151\163\141\040\111\156\164\145\162
+\156\141\164\151\157\156\141\154\040\123\145\162\166\151\143\145
+\040\101\163\163\157\143\151\141\164\151\157\156\061\040\060\036
+\006\003\125\004\003\014\027\126\151\163\141\040\120\165\142\154
+\151\143\040\122\123\101\040\122\157\157\164\040\103\101\060\036
+\027\015\062\061\060\063\061\066\060\060\060\060\060\060\132\027
+\015\064\061\060\063\061\065\060\060\060\060\060\060\132\060\157
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\015\060
+\013\006\003\125\004\012\014\004\126\111\123\101\061\057\060\055
+\006\003\125\004\013\014\046\126\151\163\141\040\111\156\164\145
+\162\156\141\164\151\157\156\141\154\040\123\145\162\166\151\143
+\145\040\101\163\163\157\143\151\141\164\151\157\156\061\040\060
+\036\006\003\125\004\003\014\027\126\151\163\141\040\120\165\142
+\154\151\143\040\122\123\101\040\122\157\157\164\040\103\101\060
+\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001
+\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000
+\331\141\033\134\264\267\200\216\213\071\217\167\154\376\312\317
+\241\016\364\275\120\136\132\374\227\347\323\220\225\231\225\322
+\172\102\354\031\325\313\370\337\257\155\176\067\211\360\356\160
+\110\230\203\161\134\073\170\327\116\077\275\313\174\013\160\036
+\124\347\122\166\364\173\322\013\115\070\251\163\226\344\066\160
+\036\276\207\053\044\000\254\256\230\220\362\060\110\366\333\151
+\162\242\224\170\230\063\133\202\036\333\234\251\212\262\253\241
+\120\370\331\276\004\322\042\002\053\147\031\345\007\303\340\024
+\263\122\167\355\247\200\152\207\300\037\244\153\306\326\132\336
+\011\240\371\336\252\354\313\224\224\151\326\077\065\247\224\030
+\351\052\164\373\303\110\332\003\041\332\333\023\034\047\145\244
+\205\122\150\320\117\133\057\053\003\052\032\215\206\026\270\011
+\341\305\013\022\236\015\066\076\153\201\257\030\115\066\173\136
+\216\114\156\121\353\056\224\217\072\142\136\277\175\012\132\057
+\301\161\273\355\010\326\015\130\024\340\355\103\063\077\167\012
+\061\015\151\030\273\306\330\370\057\025\066\122\106\361\367\103
+\071\340\045\030\053\015\206\016\047\251\043\365\253\336\373\254
+\216\070\132\243\363\106\102\270\175\015\272\013\166\230\304\267
+\163\177\215\222\306\260\373\241\367\161\003\354\023\361\257\347
+\070\337\260\251\136\106\021\005\264\115\140\312\267\124\203\120
+\314\202\357\050\375\210\112\063\261\100\252\105\324\237\276\063
+\302\204\105\203\035\314\213\223\232\031\064\033\203\343\145\300
+\230\021\342\305\107\134\045\170\263\326\374\076\071\336\056\034
+\326\062\175\371\335\041\100\104\137\135\234\356\313\014\032\252
+\265\076\226\226\322\156\327\077\161\331\227\264\121\123\131\277
+\022\206\163\040\244\056\207\162\333\323\274\217\337\314\031\237
+\022\071\045\056\341\116\215\036\267\233\052\353\237\364\130\155
+\237\243\352\103\212\151\222\034\272\261\027\227\171\136\115\124
+\147\325\244\066\030\345\220\012\021\152\223\142\003\024\055\152
+\120\330\374\270\004\152\105\314\027\264\356\065\344\312\351\121
+\246\202\257\317\136\042\135\340\064\242\255\172\163\336\003\254
+\126\027\322\071\253\130\267\224\341\257\323\011\224\013\024\213
+\002\003\001\000\001\243\102\060\100\060\035\006\003\125\035\016
+\004\026\004\024\113\115\246\016\373\240\021\350\255\013\342\360
+\363\012\000\057\254\213\026\373\060\017\006\003\125\035\023\001
+\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\001\006\060\015\006\011\052\206\110
+\206\367\015\001\001\013\005\000\003\202\002\001\000\271\005\117
+\152\101\046\130\075\310\002\247\154\164\046\352\271\366\103\046
+\136\340\145\313\117\170\015\241\047\076\253\355\012\014\060\002
+\052\344\277\314\174\375\004\216\306\045\226\212\357\247\275\354
+\256\107\350\372\033\077\337\045\245\170\273\342\171\100\100\362
+\161\371\072\323\223\060\334\162\034\044\347\231\274\070\044\325
+\354\216\231\014\024\077\246\177\005\324\023\064\231\231\367\146
+\174\165\301\271\311\140\261\054\032\352\074\176\353\243\164\254
+\216\026\052\365\333\210\045\116\343\176\054\302\044\043\170\133
+\313\151\320\075\251\130\027\265\374\046\015\263\003\370\030\313
+\071\215\016\176\145\002\215\374\276\111\025\334\025\116\356\327
+\076\337\033\347\067\340\156\151\220\245\131\224\237\112\005\302
+\155\316\043\357\231\352\001\051\066\145\271\155\337\366\241\102
+\031\240\157\172\101\367\366\175\253\225\060\006\042\131\013\315
+\234\275\362\326\011\021\202\344\316\110\305\124\010\050\206\175
+\333\360\273\234\240\243\010\245\226\365\166\234\166\373\371\210
+\233\103\323\171\147\153\051\077\112\075\146\127\363\241\253\166
+\355\141\151\310\256\073\116\045\035\273\376\055\241\252\313\050
+\146\117\372\026\300\374\136\061\226\163\077\360\107\331\220\115
+\103\171\064\310\322\130\115\334\357\062\022\301\353\265\031\165
+\072\344\031\374\207\261\034\357\024\031\116\243\276\176\023\132
+\215\164\035\207\227\316\261\234\220\276\350\041\167\306\116\270
+\317\315\366\072\331\076\107\015\157\301\000\106\122\373\324\344
+\212\074\366\345\203\064\174\363\363\354\207\145\020\157\244\342
+\256\030\301\237\066\217\275\330\366\100\304\063\236\066\336\152
+\326\242\272\277\006\256\310\345\217\057\320\264\330\364\145\207
+\142\272\104\225\207\364\131\323\227\001\273\037\301\010\223\352
+\251\321\212\217\251\363\145\162\252\126\074\046\336\225\124\016
+\202\017\057\342\034\254\034\217\121\013\022\160\320\175\133\375
+\205\347\150\306\151\320\353\027\277\234\257\034\315\311\156\366
+\024\011\106\376\113\207\330\044\365\017\003\050\255\247\232\014
+\331\361\044\220\372\132\367\231\044\236\143\302\116\061\031\104
+\371\022\235\071\002\002\205\153\141\114\222\241\357
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Visa Public RSA Root CA"
+# Issuer: CN=Visa Public RSA Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Serial Number:51:3e:96:00:00:00:db:44:27:ee:ac:e0:be:e1:48
+# Subject: CN=Visa Public RSA Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Not Valid Before: Tue Mar 16 00:00:00 2021
+# Not Valid After : Fri Mar 15 00:00:00 2041
+# Fingerprint (SHA-256): 07:CD:9A:A9:06:4A:9B:94:C6:AE:F8:FB:78:4C:1B:BC:1B:ED:A0:8A:CB:E8:68:78:D7:81:A3:91:67:62:6C:F8
+# Fingerprint (SHA1): 82:EF:4C:64:F0:57:CA:00:38:F0:DB:5B:76:C2:4B:65:4D:7C:DA:78
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Visa Public RSA Root CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\202\357\114\144\360\127\312\000\070\360\333\133\166\302\113\145
+\115\174\332\170
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\160\002\072\176\363\342\321\341\013\121\266\370\043\323\053\041
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\122\123\101\040\122\157\157\164\040\103
+\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\017\121\076\226\000\000\000\333\104\047\356\254\340\276\341
+\110
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+
+#
+# Certificate "Visa Public ECC Root CA"
+#
+# Issuer: CN=Visa Public ECC Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Serial Number:51:3e:96:00:00:00:dc:d3:06:98:8c:72:9c:fa:65
+# Subject: CN=Visa Public ECC Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Not Valid Before: Tue Mar 16 00:00:00 2021
+# Not Valid After : Fri Mar 15 00:00:00 2041
+# Fingerprint (SHA-256): E6:BE:68:CE:06:FE:0D:A0:C1:40:F1:AE:B0:0B:67:B6:36:C5:EE:A9:42:20:88:92:93:62:37:5C:E0:86:DB:39
+# Fingerprint (SHA1): 9C:B1:E6:FB:C2:1A:AF:3D:68:97:3C:B5:16:E9:32:C4:4C:B9:D5:60
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Visa Public ECC Root CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\105\103\103\040\122\157\157\164\040\103
+\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\105\103\103\040\122\157\157\164\040\103
+\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\017\121\076\226\000\000\000\334\323\006\230\214\162\234\372
+\145
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\132\060\202\001\340\240\003\002\001\002\002\017\121
+\076\226\000\000\000\334\323\006\230\214\162\234\372\145\060\012
+\006\010\052\206\110\316\075\004\003\003\060\157\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\015\060\013\006\003\125
+\004\012\014\004\126\111\123\101\061\057\060\055\006\003\125\004
+\013\014\046\126\151\163\141\040\111\156\164\145\162\156\141\164
+\151\157\156\141\154\040\123\145\162\166\151\143\145\040\101\163
+\163\157\143\151\141\164\151\157\156\061\040\060\036\006\003\125
+\004\003\014\027\126\151\163\141\040\120\165\142\154\151\143\040
+\105\103\103\040\122\157\157\164\040\103\101\060\036\027\015\062
+\061\060\063\061\066\060\060\060\060\060\060\132\027\015\064\061
+\060\063\061\065\060\060\060\060\060\060\132\060\157\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\015\060\013\006\003
+\125\004\012\014\004\126\111\123\101\061\057\060\055\006\003\125
+\004\013\014\046\126\151\163\141\040\111\156\164\145\162\156\141
+\164\151\157\156\141\154\040\123\145\162\166\151\143\145\040\101
+\163\163\157\143\151\141\164\151\157\156\061\040\060\036\006\003
+\125\004\003\014\027\126\151\163\141\040\120\165\142\154\151\143
+\040\105\103\103\040\122\157\157\164\040\103\101\060\166\060\020
+\006\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042
+\003\142\000\004\204\126\370\077\071\375\347\034\317\141\346\311
+\056\077\036\010\003\354\171\235\357\037\000\002\241\262\120\333
+\371\136\205\217\154\146\351\227\237\017\047\074\124\027\326\161
+\153\177\122\025\175\361\006\131\164\344\063\221\054\213\016\033
+\366\061\233\310\054\332\061\361\262\220\346\251\213\131\012\300
+\327\355\133\226\166\003\014\042\254\025\041\241\217\356\105\324
+\316\124\153\115\243\102\060\100\060\035\006\003\125\035\016\004
+\026\004\024\227\015\003\053\000\242\353\221\357\347\231\003\022
+\116\040\203\055\351\107\356\060\017\006\003\125\035\023\001\001
+\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\001\006\060\012\006\010\052\206\110\316
+\075\004\003\003\003\150\000\060\145\002\060\120\120\254\236\374
+\315\104\363\346\222\163\160\065\127\174\054\132\323\130\204\114
+\133\243\116\356\357\035\026\016\370\204\223\377\311\104\016\246
+\024\026\361\352\301\051\211\034\030\116\315\002\061\000\352\362
+\305\230\371\143\317\137\355\310\365\216\061\037\046\310\130\226
+\057\144\335\051\112\027\254\272\325\126\106\177\312\307\316\211
+\205\301\143\371\120\227\052\215\235\240\262\112\212\375
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "Visa Public ECC Root CA"
+# Issuer: CN=Visa Public ECC Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Serial Number:51:3e:96:00:00:00:dc:d3:06:98:8c:72:9c:fa:65
+# Subject: CN=Visa Public ECC Root CA,OU=Visa International Service Association,O=VISA,C=US
+# Not Valid Before: Tue Mar 16 00:00:00 2021
+# Not Valid After : Fri Mar 15 00:00:00 2041
+# Fingerprint (SHA-256): E6:BE:68:CE:06:FE:0D:A0:C1:40:F1:AE:B0:0B:67:B6:36:C5:EE:A9:42:20:88:92:93:62:37:5C:E0:86:DB:39
+# Fingerprint (SHA1): 9C:B1:E6:FB:C2:1A:AF:3D:68:97:3C:B5:16:E9:32:C4:4C:B9:D5:60
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Visa Public ECC Root CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\234\261\346\373\302\032\257\075\150\227\074\265\026\351\062\304
+\114\271\325\140
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\327\113\172\035\216\046\132\366\271\217\226\213\303\215\035\312
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\157\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\015\060\013\006\003\125\004\012\014\004\126\111\123\101\061\057
+\060\055\006\003\125\004\013\014\046\126\151\163\141\040\111\156
+\164\145\162\156\141\164\151\157\156\141\154\040\123\145\162\166
+\151\143\145\040\101\163\163\157\143\151\141\164\151\157\156\061
+\040\060\036\006\003\125\004\003\014\027\126\151\163\141\040\120
+\165\142\154\151\143\040\105\103\103\040\122\157\157\164\040\103
+\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\017\121\076\226\000\000\000\334\323\006\230\214\162\234\372
+\145
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
diff --git a/SPECS/fluent-bit/fluent-bit.signatures.json b/SPECS/fluent-bit/fluent-bit.signatures.json
index c2ef56ce0a0..4c15cc2063a 100644
--- a/SPECS/fluent-bit/fluent-bit.signatures.json
+++ b/SPECS/fluent-bit/fluent-bit.signatures.json
@@ -1,5 +1,5 @@
 {
     "Signatures": {
-        "fluent-bit-1.8.12.tar.gz" : "50f2a4e9eb6c2a2df58b78ef562e23c1ef9871c389c7bd0320f6b381d2b491c8"
+        "fluent-bit-1.9.6.tar.gz" : "7f4de8d561695d9153dbe39b7f6d919dc849daf57cb7c402a2beb0ebe35a42e0"
     }
 }
diff --git a/SPECS/fluent-bit/fluent-bit.spec b/SPECS/fluent-bit/fluent-bit.spec
index 3fa354ddece..9c7af8bfed3 100644
--- a/SPECS/fluent-bit/fluent-bit.spec
+++ b/SPECS/fluent-bit/fluent-bit.spec
@@ -1,7 +1,7 @@
 Summary:        Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
 Name:           fluent-bit
-Version:        1.8.12
-Release:        2%{?dist}
+Version:        1.9.6
+Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -16,6 +16,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  gnutls-devel
 BuildRequires:  graphviz
 BuildRequires:  libpq-devel
+BuildRequires:  libyaml-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
@@ -25,7 +26,7 @@ BuildRequires:  zlib-devel
 
 %description
 
-Fluent Bit is a fast Log Processor and Forwarder for Linux, Embedded Linux, MacOS and BSD 
+Fluent Bit is a fast Log Processor and Forwarder for Linux, Embedded Linux, MacOS and BSD
 family operating systems. It's part of the Fluentd Ecosystem and a CNCF sub-project.
 
 %package devel
@@ -39,7 +40,7 @@ Development files for %{name}
 %setup -q
 
 %build
-	
+
 %cmake\
     -DCMAKE_BUILD_TYPE=RelWithDebInfo\
     -DFLB_EXAMPLES=Off\
@@ -54,7 +55,7 @@ Development files for %{name}
     -DFLB_DEBUG=Off\
     -DFLB_TLS=On \
     -DFLB_JEMALLOC=on
- 
+
 %cmake_build
 
 %install
@@ -73,6 +74,10 @@ Development files for %{name}
 %{_libdir}/fluent-bit/*.so
 
 %changelog
+* Wed Aug 03 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1.9.6-1
+- Upgrade version to 1.9.6
+- Add build time dependency libyaml-devel
+
 * Thu Feb 19 2022 Sriram Nambakam <snambakam@microsoft.com> - 1.8.12-2
 - Compile with -DFLB_JEMALLOC=on.
 
@@ -89,4 +94,3 @@ Development files for %{name}
 
 * Mon Mar 30 2020 Jonathan Chiu <jochi@microsoft.com> - 1.4.1-1
 - Original version for CBL-Mariner.
-
diff --git a/SPECS-EXTENDED/freeipmi/bmc-watchdog.service b/SPECS/freeipmi/bmc-watchdog.service
similarity index 100%
rename from SPECS-EXTENDED/freeipmi/bmc-watchdog.service
rename to SPECS/freeipmi/bmc-watchdog.service
diff --git a/SPECS-EXTENDED/freeipmi/freeipmi.signatures.json b/SPECS/freeipmi/freeipmi.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/freeipmi/freeipmi.signatures.json
rename to SPECS/freeipmi/freeipmi.signatures.json
diff --git a/SPECS-EXTENDED/freeipmi/freeipmi.spec b/SPECS/freeipmi/freeipmi.spec
similarity index 99%
rename from SPECS-EXTENDED/freeipmi/freeipmi.spec
rename to SPECS/freeipmi/freeipmi.spec
index 9fc9a04886d..f1808bba74f 100644
--- a/SPECS-EXTENDED/freeipmi/freeipmi.spec
+++ b/SPECS/freeipmi/freeipmi.spec
@@ -5,7 +5,7 @@ Distribution:   Mariner
 
 Name:             freeipmi
 Version:          1.6.6
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          IPMI remote console and system management software
 License:          GPLv3+
 URL:              http://www.gnu.org/software/freeipmi/
@@ -13,7 +13,9 @@ Source0:          http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:          bmc-watchdog.service
 Source2:          ipmidetectd.service
 Source3:          ipmiseld.service
-BuildRequires:    libgcrypt-devel texinfo systemd 
+BuildRequires:    libgcrypt-devel 
+BuildRequires:    texinfo 
+BuildRequires:    systemd 
 %{?systemd_requires}
 BuildRequires:    gcc
 
@@ -343,6 +345,10 @@ rm -frv %{buildroot}%{_initrddir} %{buildroot}%{_sysconfdir}/init.d
 %dir %{_localstatedir}/cache/ipmiseld
 
 %changelog
+* Thu Jul 28 2022 Henry Li <lihl@microsoft.com> - 1.6.6-3
+- Fix spec formatting
+- License Verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.6-2
 - Initial CBL-Mariner import from Fedora 33 (license: MIT).
 
diff --git a/SPECS-EXTENDED/freeipmi/ipmidetectd.service b/SPECS/freeipmi/ipmidetectd.service
similarity index 100%
rename from SPECS-EXTENDED/freeipmi/ipmidetectd.service
rename to SPECS/freeipmi/ipmidetectd.service
diff --git a/SPECS-EXTENDED/freeipmi/ipmiseld.service b/SPECS/freeipmi/ipmiseld.service
similarity index 100%
rename from SPECS-EXTENDED/freeipmi/ipmiseld.service
rename to SPECS/freeipmi/ipmiseld.service
diff --git a/SPECS-EXTENDED/iptraf-ng/iptraf-ng-logrotate.conf b/SPECS/iptraf-ng/iptraf-ng-logrotate.conf
similarity index 100%
rename from SPECS-EXTENDED/iptraf-ng/iptraf-ng-logrotate.conf
rename to SPECS/iptraf-ng/iptraf-ng-logrotate.conf
diff --git a/SPECS-EXTENDED/iptraf-ng/iptraf-ng-tmpfiles.conf b/SPECS/iptraf-ng/iptraf-ng-tmpfiles.conf
similarity index 100%
rename from SPECS-EXTENDED/iptraf-ng/iptraf-ng-tmpfiles.conf
rename to SPECS/iptraf-ng/iptraf-ng-tmpfiles.conf
diff --git a/SPECS-EXTENDED/iptraf-ng/iptraf-ng.signatures.json b/SPECS/iptraf-ng/iptraf-ng.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/iptraf-ng/iptraf-ng.signatures.json
rename to SPECS/iptraf-ng/iptraf-ng.signatures.json
diff --git a/SPECS-EXTENDED/iptraf-ng/iptraf-ng.spec b/SPECS/iptraf-ng/iptraf-ng.spec
similarity index 100%
rename from SPECS-EXTENDED/iptraf-ng/iptraf-ng.spec
rename to SPECS/iptraf-ng/iptraf-ng.spec
diff --git a/SPECS-EXTENDED/ksh/dotkshrc b/SPECS/ksh/dotkshrc
similarity index 100%
rename from SPECS-EXTENDED/ksh/dotkshrc
rename to SPECS/ksh/dotkshrc
diff --git a/SPECS-EXTENDED/ksh/ksh-1.0.0-beta.1-fix-build.patch b/SPECS/ksh/ksh-1.0.0-beta.1-fix-build.patch
similarity index 100%
rename from SPECS-EXTENDED/ksh/ksh-1.0.0-beta.1-fix-build.patch
rename to SPECS/ksh/ksh-1.0.0-beta.1-fix-build.patch
diff --git a/SPECS-EXTENDED/ksh/ksh-1.0.0-beta.1-regre-tests.patch b/SPECS/ksh/ksh-1.0.0-beta.1-regre-tests.patch
similarity index 100%
rename from SPECS-EXTENDED/ksh/ksh-1.0.0-beta.1-regre-tests.patch
rename to SPECS/ksh/ksh-1.0.0-beta.1-regre-tests.patch
diff --git a/SPECS-EXTENDED/ksh/ksh.signatures.json b/SPECS/ksh/ksh.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/ksh/ksh.signatures.json
rename to SPECS/ksh/ksh.signatures.json
diff --git a/SPECS-EXTENDED/ksh/ksh.spec b/SPECS/ksh/ksh.spec
similarity index 100%
rename from SPECS-EXTENDED/ksh/ksh.spec
rename to SPECS/ksh/ksh.spec
diff --git a/SPECS-EXTENDED/ksh/kshcomp.conf b/SPECS/ksh/kshcomp.conf
similarity index 100%
rename from SPECS-EXTENDED/ksh/kshcomp.conf
rename to SPECS/ksh/kshcomp.conf
diff --git a/SPECS-EXTENDED/ksh/kshrc.rhs b/SPECS/ksh/kshrc.rhs
similarity index 100%
rename from SPECS-EXTENDED/ksh/kshrc.rhs
rename to SPECS/ksh/kshrc.rhs
diff --git a/SPECS/ldns/CVE-2017-1000231.nopatch b/SPECS/ldns/CVE-2017-1000231.nopatch
new file mode 100644
index 00000000000..3b0da0703ed
--- /dev/null
+++ b/SPECS/ldns/CVE-2017-1000231.nopatch
@@ -0,0 +1 @@
+CVE-2017-1000231 - Already addressed in ldns-1.7.0-realloc.patch
\ No newline at end of file
diff --git a/SPECS/ldns/CVE-2017-1000232.nopatch b/SPECS/ldns/CVE-2017-1000232.nopatch
new file mode 100644
index 00000000000..8166572a8fe
--- /dev/null
+++ b/SPECS/ldns/CVE-2017-1000232.nopatch
@@ -0,0 +1 @@
+CVE-2017-1000232 - Already addressed in ldns-1.7.0-parse-limit.patch
\ No newline at end of file
diff --git a/SPECS-EXTENDED/lldpd/lldpd-el6.init b/SPECS/lldpd/lldpd-el6.init
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd-el6.init
rename to SPECS/lldpd/lldpd-el6.init
diff --git a/SPECS-EXTENDED/lldpd/lldpd-el7.service b/SPECS/lldpd/lldpd-el7.service
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd-el7.service
rename to SPECS/lldpd/lldpd-el7.service
diff --git a/SPECS-EXTENDED/lldpd/lldpd-fedora.service b/SPECS/lldpd/lldpd-fedora.service
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd-fedora.service
rename to SPECS/lldpd/lldpd-fedora.service
diff --git a/SPECS-EXTENDED/lldpd/lldpd-fedora.sysconfig b/SPECS/lldpd/lldpd-fedora.sysconfig
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd-fedora.sysconfig
rename to SPECS/lldpd/lldpd-fedora.sysconfig
diff --git a/SPECS-EXTENDED/lldpd/lldpd-tmpfiles b/SPECS/lldpd/lldpd-tmpfiles
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd-tmpfiles
rename to SPECS/lldpd/lldpd-tmpfiles
diff --git a/SPECS-EXTENDED/lldpd/lldpd.signatures.json b/SPECS/lldpd/lldpd.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/lldpd/lldpd.signatures.json
rename to SPECS/lldpd/lldpd.signatures.json
diff --git a/SPECS-EXTENDED/lldpd/lldpd.spec b/SPECS/lldpd/lldpd.spec
similarity index 97%
rename from SPECS-EXTENDED/lldpd/lldpd.spec
rename to SPECS/lldpd/lldpd.spec
index 7782cb54757..c7d5f24e73a 100644
--- a/SPECS-EXTENDED/lldpd/lldpd.spec
+++ b/SPECS/lldpd/lldpd.spec
@@ -1,18 +1,13 @@
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-%if 0%{?el6}
-%bcond_with systemd
-%global rundir /var/run/
-%else
 %bcond_without systemd
 %global rundir /run/
-%endif
 
 %global gh_owner vincentbernat
 
 Name:     lldpd
 Version:  1.0.4
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  ISC-licensed implementation of LLDP
 
 License:  ISC
@@ -29,12 +24,7 @@ BuildRequires: readline-devel
 BuildRequires: check-devel
 BuildRequires: net-snmp-devel
 BuildRequires: libxml2-devel
-# EL6 needs libevent2 as the package
-%if 0%{?el6}
-BuildRequires: libevent2-devel
-%else
 BuildRequires: libevent-devel
-%endif
 
 %if 0%{?with_systemd}
 # For systemd stuff
@@ -174,6 +164,10 @@ fi
 
 
 %changelog
+* Thu Jul 28 2022 Henry Li <lihl@microsoft.com> - 1.0.4-4
+- License Verified
+- Remove usage of macros that do not apply for CBL-Mariner
+
 * Fri Apr 30 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.4-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Making binaries paths compatible with CBL-Mariner's paths.
diff --git a/SPECS-EXTENDED/nfs4-acl-tools/nfs4-acl-tools.signatures.json b/SPECS/nfs4-acl-tools/nfs4-acl-tools.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/nfs4-acl-tools/nfs4-acl-tools.signatures.json
rename to SPECS/nfs4-acl-tools/nfs4-acl-tools.signatures.json
diff --git a/SPECS-EXTENDED/nfs4-acl-tools/nfs4-acl-tools.spec b/SPECS/nfs4-acl-tools/nfs4-acl-tools.spec
similarity index 100%
rename from SPECS-EXTENDED/nfs4-acl-tools/nfs4-acl-tools.spec
rename to SPECS/nfs4-acl-tools/nfs4-acl-tools.spec
diff --git a/SPECS/perl-CGI/perl-CGI.spec b/SPECS/perl-CGI/perl-CGI.spec
index 229d23c0552..3fc2a8f0146 100644
--- a/SPECS/perl-CGI/perl-CGI.spec
+++ b/SPECS/perl-CGI/perl-CGI.spec
@@ -3,7 +3,7 @@
 Summary:        Handle Common Gateway Interface requests and responses
 Name:           perl-CGI
 Version:        4.54
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 Source0:        https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz
@@ -17,6 +17,14 @@ BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
 BuildRequires:  sed
+BuildRequires:  perl(ExtUtils::MakeMaker)
+%if %{with_check}
+BuildRequires:  perl(CPAN)
+BuildRequires:  perl(CPAN::Meta)
+BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(blib)
+%endif
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(File::Spec) >= 0.82
@@ -84,6 +92,9 @@ make %{?_smp_mflags} test
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Aug 01 2022 Muhammad Falak <mwani@microsoft.com> - 4.54-2
+- Add BR on `cpan` & `perl(Test::*)` to enable ptest
+
 *   Tue Apr 26 2022 Mateusz Malisz <mamalisz@microsoft.com> - 4.54-1
 -   Update to 4.54
 
diff --git a/SPECS-EXTENDED/postfix/README-Postfix-SASL-RedHat.txt b/SPECS/postfix/README-Postfix-SASL-RedHat.txt
similarity index 100%
rename from SPECS-EXTENDED/postfix/README-Postfix-SASL-RedHat.txt
rename to SPECS/postfix/README-Postfix-SASL-RedHat.txt
diff --git a/SPECS-EXTENDED/postfix/pflogsumm-1.1.5-datecalc.patch b/SPECS/postfix/pflogsumm-1.1.5-datecalc.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/pflogsumm-1.1.5-datecalc.patch
rename to SPECS/postfix/pflogsumm-1.1.5-datecalc.patch
diff --git a/SPECS-EXTENDED/postfix/pflogsumm-1.1.5-ipv6-warnings-fix.patch b/SPECS/postfix/pflogsumm-1.1.5-ipv6-warnings-fix.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/pflogsumm-1.1.5-ipv6-warnings-fix.patch
rename to SPECS/postfix/pflogsumm-1.1.5-ipv6-warnings-fix.patch
diff --git a/SPECS-EXTENDED/postfix/pflogsumm-1.1.5-syslog-name-underscore-fix.patch b/SPECS/postfix/pflogsumm-1.1.5-syslog-name-underscore-fix.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/pflogsumm-1.1.5-syslog-name-underscore-fix.patch
rename to SPECS/postfix/pflogsumm-1.1.5-syslog-name-underscore-fix.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.3.3-alternatives.patch b/SPECS/postfix/postfix-3.3.3-alternatives.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.3.3-alternatives.patch
rename to SPECS/postfix/postfix-3.3.3-alternatives.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.4.0-files.patch b/SPECS/postfix/postfix-3.4.0-files.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.4.0-files.patch
rename to SPECS/postfix/postfix-3.4.0-files.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.4.0-large-fs.patch b/SPECS/postfix/postfix-3.4.0-large-fs.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.4.0-large-fs.patch
rename to SPECS/postfix/postfix-3.4.0-large-fs.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.4.4-chroot-example-fix.patch b/SPECS/postfix/postfix-3.4.4-chroot-example-fix.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.4.4-chroot-example-fix.patch
rename to SPECS/postfix/postfix-3.4.4-chroot-example-fix.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.5.0-config.patch b/SPECS/postfix/postfix-3.5.0-config.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.5.0-config.patch
rename to SPECS/postfix/postfix-3.5.0-config.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.6.2-glibc-234-build-fix.patch b/SPECS/postfix/postfix-3.6.2-glibc-234-build-fix.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.6.2-glibc-234-build-fix.patch
rename to SPECS/postfix/postfix-3.6.2-glibc-234-build-fix.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-3.6.2-whitespace-name-fix.patch b/SPECS/postfix/postfix-3.6.2-whitespace-name-fix.patch
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-3.6.2-whitespace-name-fix.patch
rename to SPECS/postfix/postfix-3.6.2-whitespace-name-fix.patch
diff --git a/SPECS-EXTENDED/postfix/postfix-chroot-update b/SPECS/postfix/postfix-chroot-update
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-chroot-update
rename to SPECS/postfix/postfix-chroot-update
diff --git a/SPECS-EXTENDED/postfix/postfix-etc-init.d-postfix b/SPECS/postfix/postfix-etc-init.d-postfix
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-etc-init.d-postfix
rename to SPECS/postfix/postfix-etc-init.d-postfix
diff --git a/SPECS-EXTENDED/postfix/postfix-pam.conf b/SPECS/postfix/postfix-pam.conf
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-pam.conf
rename to SPECS/postfix/postfix-pam.conf
diff --git a/SPECS-EXTENDED/postfix/postfix-sasl.conf b/SPECS/postfix/postfix-sasl.conf
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix-sasl.conf
rename to SPECS/postfix/postfix-sasl.conf
diff --git a/SPECS-EXTENDED/postfix/postfix.aliasesdb b/SPECS/postfix/postfix.aliasesdb
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix.aliasesdb
rename to SPECS/postfix/postfix.aliasesdb
diff --git a/SPECS-EXTENDED/postfix/postfix.service b/SPECS/postfix/postfix.service
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix.service
rename to SPECS/postfix/postfix.service
diff --git a/SPECS-EXTENDED/postfix/postfix.signatures.json b/SPECS/postfix/postfix.signatures.json
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix.signatures.json
rename to SPECS/postfix/postfix.signatures.json
diff --git a/SPECS-EXTENDED/postfix/postfix.spec b/SPECS/postfix/postfix.spec
similarity index 100%
rename from SPECS-EXTENDED/postfix/postfix.spec
rename to SPECS/postfix/postfix.spec
diff --git a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
index 94008d0f358..859fae62868 100644
--- a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
+++ b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates-base
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <cblmargh@microsoft.com> - 2.0.0-7
+- Making 'Release' match with 'ca-certificates'.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-6
 - Adding conflict information with "ca-certificates-shared".
 
diff --git a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
index 82b96a57228..488c10adb0a 100644
--- a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
+++ b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Aug 03 2022 CBL-Mariner Service Account <cblmargh@microsoft.com> - 2.0.0-7
+- Making 'Release' match with 'ca-certificates'.
+
 * Wed Jun 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-6
 - Adding conflict information with "ca-certificates-shared".
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 43ef82501e1..07268def9e1 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -3278,8 +3278,8 @@
         "type": "other",
         "other": {
           "name": "fluent-bit",
-          "version": "1.8.12",
-          "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v1.8.12.tar.gz"
+          "version": "1.9.6",
+          "downloadUrl": "https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.6.tar.gz"
         }
       }
     },
diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
index dc7f0550131..3e9b48aeea3 100644
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -227,10 +227,10 @@ libffi-devel-3.4.2-2.cm2.aarch64.rpm
 libtasn1-4.18.0-2.cm2.aarch64.rpm
 p11-kit-0.24.1-1.cm2.aarch64.rpm
 p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
 dwz-0.14-1.cm2.aarch64.rpm
 unzip-6.0-19.cm2.aarch64.rpm
 python3-3.9.13-3.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 a8e4b847981..25b4b79d54c 100644
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@@ -227,10 +227,10 @@ libffi-devel-3.4.2-2.cm2.x86_64.rpm
 libtasn1-4.18.0-2.cm2.x86_64.rpm
 p11-kit-0.24.1-1.cm2.x86_64.rpm
 p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
 dwz-0.14-1.cm2.x86_64.rpm
 unzip-6.0-19.cm2.x86_64.rpm
 python3-3.9.13-3.cm2.x86_64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
index e6e54b94ac9..7e9b727c307 100644
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.aarch64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.aarch64.rpm
 bzip2-devel-1.0.8-1.cm2.aarch64.rpm
 bzip2-libs-1.0.8-1.cm2.aarch64.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-6.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-7.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
 check-0.15.2-1.cm2.aarch64.rpm
 check-debuginfo-0.15.2-1.cm2.aarch64.rpm
 chkconfig-1.20-3.cm2.aarch64.rpm
diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
index ec2ade2f467..9f2227f95a9 100644
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.x86_64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.x86_64.rpm
 bzip2-devel-1.0.8-1.cm2.x86_64.rpm
 bzip2-libs-1.0.8-1.cm2.x86_64.rpm
-ca-certificates-2.0.0-6.cm2.noarch.rpm
-ca-certificates-base-2.0.0-6.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-6.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-6.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-6.cm2.noarch.rpm
+ca-certificates-2.0.0-7.cm2.noarch.rpm
+ca-certificates-base-2.0.0-7.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-7.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-7.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-7.cm2.noarch.rpm
 check-0.15.2-1.cm2.x86_64.rpm
 check-debuginfo-0.15.2-1.cm2.x86_64.rpm
 chkconfig-1.20-3.cm2.x86_64.rpm