diff --git a/_sources/canasta/DockerSettings.php b/_sources/canasta/DockerSettings.php
index 567e0245..f8186ef2 100644
--- a/_sources/canasta/DockerSettings.php
+++ b/_sources/canasta/DockerSettings.php
@@ -33,10 +33,12 @@ function isEnvTrue( $name ): bool {
 	'Vector', # bundled
 	'chameleon',
 	'Pivot',
+	'Citizen'
 ];
 
 const DOCKER_EXTENSIONS = [
 	'SemanticMediaWiki', // keep it at the top to be enabled first, because some Semantic extension don't work in other case.
+	'AccountInfo',
 	'AJAXPoll',
 	'AbuseFilter',
 	'AddMessages',
@@ -60,6 +62,7 @@ function isEnvTrue( $name ): bool {
 	'Cite', # bundled
 	'CiteThisPage', # bundled
 	'Citoid',
+	'CleanChanges',
 	'CodeEditor', # bundled
 	'CodeMirror',
 	'Collection',
@@ -127,6 +130,7 @@ function isEnvTrue( $name ): bool {
 	'MassPasswordReset',
 	'Math',
 	'MediaUploader',
+	'MediaSearch',
 	'Mermaid',
 	'MobileDetect',
 	'MobileFrontend',
@@ -154,6 +158,7 @@ function isEnvTrue( $name ): bool {
 	'Popups',
 	'PubmedParser',
 	'RegularTooltips',
+	'RelatedArticles',
 	'RemoteWiki',
 	'ReplaceText', # bundled
 	'RevisionSlider',
@@ -185,11 +190,13 @@ function isEnvTrue( $name ): bool {
 	'Survey',
 	'SyntaxHighlight_GeSHi', # bundled
 	'Share',
+	'ShortDescription',
 	'Tabber',
 	'TabberNeue',
 	'Tabs',
 	'TemplateData', # bundled
 	'TemplateStyles',
+	'TemplateStylesExtender',
 	'TemplateWizard',
 	'TextExtracts', # bundled
 	'Thanks', # bundled
diff --git a/docs/README.md b/docs/README.md
index 3d833d72..a4d57984 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -16,6 +16,7 @@ Extensions, skins, and patches are defined in [values.yml](../values.yml).
 | LTS MediaWiki upgrades | [upgrades/mediawiki-major.md](upgrades/mediawiki-major.md) |
 | PHP version upgrades | [upgrades/php.md](upgrades/php.md) |
 | End-to-end tests (Playwright) | [../e2e/README.md](../e2e/README.md) |
+| Citizen skin recommended extensions configuration | [citizen.md](citizen.md) |
 
 ## LTS policy
 
diff --git a/docs/citizen.md b/docs/citizen.md
new file mode 100644
index 00000000..6370a5eb
--- /dev/null
+++ b/docs/citizen.md
@@ -0,0 +1,41 @@
+Citizen skin recommended extensions bundle:
+
+```php
+<?php
+wfLoadExtension('SemanticMediaWiki');
+wfLoadExtension('SemanticResultFormats');
+wfLoadExtension('VisualEditor');
+wfLoadExtension('WikiEditor');
+wfLoadExtension('PageImages');
+wfLoadExtension('TextExtracts');
+$wgExtractsExtendRestSearch = true;
+wfLoadExtension('Popups');
+wfLoadExtension('Cite');
+wfLoadExtension( 'ShortDescription' );
+wfLoadExtension( 'MediaSearch' );
+wfLoadExtension( 'TemplateStyles' );
+wfLoadExtension( 'TemplateStylesExtender' );
+wfLoadExtension( 'AccountInfo' );
+wfLoadExtension( 'AdvancedSearch' );
+wfLoadExtension( 'CleanChanges' );
+wfLoadExtension( 'CodeMirror' );
+wfLoadExtension( 'SyntaxHighlight_GeSHi' );
+wfLoadExtension( 'CommentStreams' );
+$wgCommentStreamsEnableVoting = true;
+$wgCommentStreamsNotifier = 'echo';
+# <no-comment-streams /> - add to disable comments on the page
+# <comment-streams /> - add to enable comments on the page
+# outside of the namespaces list below
+$wgCommentStreamsAllowedNamespaces = [0];
+wfLoadExtension( 'Echo' );
+wfLoadExtension( 'VEForAll' );
+wfLoadExtension( 'Linter' );
+wfLoadExtension( 'DiscussionTools' );
+wfLoadExtension( 'RelatedArticles' );
+wfLoadExtension( 'RevisionSlider' );
+wfLoadExtension( 'TemplateData' );
+
+wfLoadSkin( 'Citizen' );
+$wgRelatedArticlesFooterAllowedSkins[] = 'citizen';
+$wgDefaultSkin = 'citizen';
+```
diff --git a/values.yml b/values.yml
index 7ae00867..d32b0679 100644
--- a/values.yml
+++ b/values.yml
@@ -78,7 +78,9 @@ extensions:
       gerrit_ref: refs/changes/00/1131800/1
   - CommentStreams:
       Wikidata ID: Q25662100
-      commit: 25340d9d06a7547ba31d9dc4ef0ac100a48f70ed
+      commit: 47826129a20826c10f691f32a47a96cc6998d543
+      additional steps:
+        - composer update
   - CommonsMetadata:
       Wikidata ID: Q21676600
       commit: 133fd7511eff158456e194315e5f477166ef3206
@@ -267,7 +269,7 @@ extensions:
       commit: e52d009f1a01575de2abebf802c6e97b24587d9a
   - RevisionSlider:
       Wikidata ID: Q24036451
-      commit: b10b2150133e77099a37b089003170c0111eb681
+      commit: 57429801b90a3ac98daa6d6c72db7b526a95c1bf
   - RottenLinks:
       Wikidata ID: Q59088472
       repository: https://github.com/miraheze/RottenLinks.git
@@ -534,6 +536,22 @@ extensions:
       branch: master
       # Pin matches former CKN submodule (2.1.0-alpha); 3.0.0 requires SMW >= 7.0.
       commit: bc69880ff2c33688138d1db1e3cc61acc6617221
+  - ShortDescription:
+      branch: main
+      repository: https://github.com/StarCitizenTools/mediawiki-extensions-ShortDescription.git
+      commit: 04b017977588cb21dfcc32b05b589882fe1f867f
+  - MediaSearch:
+      commit: e164d4d9e83dfccdd24fd1181988882bde2c7f43
+  - TemplateStylesExtender:
+      branch: master
+      repository: https://github.com/octfx/mediawiki-extensions-TemplateStylesExtender.git
+      commit: 28d54a808fd921bbdab203831ddfc5dffc9a9163
+  - AccountInfo:
+      commit: c50cd99c0bd0fb7411e3e36b07785161a8664900
+  - CleanChanges:
+      commit: dd6693e0ede4ff297818857ba5604534575e4a23
+  - RelatedArticles:
+      commit: 4f5c9283dce21e859c4ddbc5a5055adf620af234
 # Skins to install
 skins:
   - CologneBlue:
@@ -549,6 +567,10 @@ skins:
   - Refreshed:
       Wikidata ID: Q22713061
       commit: 2570c3ee3996cd8ca3f766131b301c33695f68e6
+  - Citizen:
+      repository: https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git
+      branch: main
+      commit: 646f80ed5e8f0578d7d941a157b20b3bd78f9b93
 # Composer packages (extensions) to install
 packages:
   - name: mediawiki/semantic-media-wiki