diff --git a/.gitmodules b/.gitmodules
index f81e378..def16a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,3 @@
-[submodule "silverstripe-simple"]
-	path = silverstripe-simple
-	url = https://github.com/amazeeio/silverstripe-example.git
-	branch = master
-[submodule "silverstripe-advanced"]
-	path = silverstripe-advanced
-	url = https://github.com/amazeeio/silverstripe-example.git
-	branch = redis_solr
 [submodule "node-example"]
 	path = node-example
 	url = https://github.com/amazeeio/node-example.git
diff --git a/drupal-base b/drupal-base
index 4fadefc..3e76c8d 160000
--- a/drupal-base
+++ b/drupal-base
@@ -1 +1 @@
-Subproject commit 4fadefc4f1f73c8c9982097ba464674757c11799
+Subproject commit 3e76c8dfbdd0df0ec57be2831bcd0871b81be3b9
diff --git a/drupal-opensearch b/drupal-opensearch
index 9b2eaf6..ffee595 160000
--- a/drupal-opensearch
+++ b/drupal-opensearch
@@ -1 +1 @@
-Subproject commit 9b2eaf6ab77db70e4c225b505c0233b720983c03
+Subproject commit ffee59503e7e90def00565b972a67ad3ad75f59e
diff --git a/drupal-postgres b/drupal-postgres
index b3f4c08..c526f10 160000
--- a/drupal-postgres
+++ b/drupal-postgres
@@ -1 +1 @@
-Subproject commit b3f4c087d4ca1f6e2b6a4c5d0e9d6a44de58b1e9
+Subproject commit c526f1097e7277406a3d91167d54a6ccc0396300
diff --git a/drupal-solr b/drupal-solr
index 0a75cb8..84c663d 160000
--- a/drupal-solr
+++ b/drupal-solr
@@ -1 +1 @@
-Subproject commit 0a75cb82795f04a7c8b34b0e14c518b2c13ab32f
+Subproject commit 84c663d29409847135b09cae08ef79b6f4a0fa41
diff --git a/node-example b/node-example
index 84f36c5..1eb87d6 160000
--- a/node-example
+++ b/node-example
@@ -1 +1 @@
-Subproject commit 84f36c569697016418c058ee1f64ed7e33525d32
+Subproject commit 1eb87d66b4bebdbd6d0c134c76db9f49cb410c77
diff --git a/silverstripe-advanced b/silverstripe-advanced
deleted file mode 160000
index d1944b5..0000000
--- a/silverstripe-advanced
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1944b520641411c497043567d0ed681ae537044
diff --git a/silverstripe-simple b/silverstripe-simple
deleted file mode 160000
index f200d96..0000000
--- a/silverstripe-simple
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f200d96b7b4e3c4b789293d6aec4835d383576ec
diff --git a/wordpress-base b/wordpress-base
index ae0d970..a6ab898 160000
--- a/wordpress-base
+++ b/wordpress-base
@@ -1 +1 @@
-Subproject commit ae0d9704e2c3f59a163c587a5e77cbc69eea726f
+Subproject commit a6ab8983aea01c089dcf85a809c3a33ec8fa85dd