diff --git a/.gitmodules b/.gitmodules
index 5e8cf8d..f81e378 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,17 +10,13 @@
 	path = node-example
 	url = https://github.com/amazeeio/node-example.git
 	branch = main
-[submodule "drupal9-solr"]
+[submodule "drupal-solr"]
 	path = drupal-solr
-	url = https://github.com/lagoon-examples/drupal9-solr.git
+	url = https://github.com/lagoon-examples/drupal-solr.git
 	branch = main
-[submodule "drupal9-postgres"]
-	path = drupal9-postgres
-	url = https://github.com/lagoon-examples/drupal9-postgres.git
-	branch = main
-[submodule "drupal9-full"]
-	path = drupal-full
-	url = https://github.com/lagoon-examples/drupal9-full.git
+[submodule "drupal-postgres"]
+	path = drupal-postgres
+	url = https://github.com/lagoon-examples/drupal-postgres.git
 	branch = main
 [submodule "wordpress-base"]
 	path = wordpress-base
diff --git a/drupal-full b/drupal-full
deleted file mode 160000
index 2e46c96..0000000
--- a/drupal-full
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e46c96a6ad13f16bfd8e4736c94584cb43ae189
diff --git a/drupal-postgres b/drupal-postgres
new file mode 160000
index 0000000..8595c57
--- /dev/null
+++ b/drupal-postgres
@@ -0,0 +1 @@
+Subproject commit 8595c57afcfa58d5dae0290dba3e822eccfdd870
diff --git a/drupal9-postgres b/drupal9-postgres
deleted file mode 160000
index 768baa0..0000000
--- a/drupal9-postgres
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 768baa0c605a916c4cb0d64fb479d5dc2af757df
diff --git a/wordpress-base b/wordpress-base
index 1cfc1c5..60d1f02 160000
--- a/wordpress-base
+++ b/wordpress-base
@@ -1 +1 @@
-Subproject commit 1cfc1c5fac799ad2779356b9277b76b67baf748b
+Subproject commit 60d1f02f12fbdc5b7d04871bc0e969ff24085bf5