diff --git a/localsettings/extensions-CirrusSearch.txt b/localsettings/extensions-CirrusSearch.txt
new file mode 100644
index 00000000..47550e15
--- /dev/null
+++ b/localsettings/extensions-CirrusSearch.txt
@@ -0,0 +1,5 @@
+require_once "$IP/extensions/CirrusSearch/tests/jenkins/FullyFeaturedConfig.php";
+$wgCirrusSearchServers = [ 'localhost' ];
+$wgCirrusSearchWMFExtraFeatures = [
+	'weighted_tags' => [ 'build' => true, 'use' => true ]
+];
diff --git a/new/postinstall.sh b/new/postinstall.sh
index 52cf0e3c..a1750746 100755
--- a/new/postinstall.sh
+++ b/new/postinstall.sh
@@ -38,6 +38,15 @@ if [ -d $PATCHDEMO/wikis/$NAME/w/extensions/SecurePoll ]; then
 	php $PATCHDEMO/wikis/$NAME/w/maintenance/createAndPromote.php "Patch Demo" --force --custom-groups electionadmin
 fi
 
+# CirrusSearch
+if [ -d $PATCHDEMO/wikis/$NAME/w/extensions/CirrusSearch ]; then
+  php $PATCHDEMO/wikis/$NAME/w/maintenance/update.php --quick
+  php $PATCHDEMO/wikis/$NAME/w/extensions/CirrusSearch/maintenance/UpdateSearchIndexConfig.php
+  php $PATCHDEMO/wikis/$NAME/w/extensions/CirrusSearch/maintenance/ForceSearchIndex.php --skipLinks --indexOnSkip
+  php $PATCHDEMO/wikis/$NAME/w/extensions/CirrusSearch/maintenance/ForceSearchIndex.php --skipParse
+  php $PATCHDEMO/wikis/$NAME/w/maintenance/runJobs.php
+fi
+
 # import extension/skin/service-specific XML dumps
 while IFS=' ' read -r repo dir; do
 	filename=$(echo $repo | sed "s/\//-/g" | sed "s/^mediawiki-//")
diff --git a/setup.sh b/setup.sh
index 54e46250..3df2925f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,6 +3,19 @@ sudo apt-get install apache2 default-mysql-server php libapache2-mod-php php-mys
 # dependencies of our system
 sudo apt-get install git composer npm unzip rdfind
 
+# Docker
+# https://docs.docker.com/engine/install/debian/#install-using-the-convenience-script
+curl -fsSL https://get.docker.com -o get-docker.sh
+sudo sh get-docker.sh
+# ElasticSearch
+docker run -d --restart=always \
+  -v elasticdata:/usr/share/elasticsearch/data \
+  -e "discovery.type=single-node" \
+  -e "bootstrap.system_call_filter=false" \
+  -p 9200:9200 \
+  -p 9300:9300 \
+  docker-registry.wikimedia.org/dev/stretch-elasticsearch:0.1.0
+
 # create master copies of repositories
 sudo -u www-data mkdir repositories
 cd repositories