diff --git a/README.md b/README.md
index 7577857..68236dd 100644
--- a/README.md
+++ b/README.md
@@ -34,13 +34,13 @@ The underlying spirit of this project is to allow "repeatable deployments", and
 
 ### Run
 
--   `docker-compose pull` if you want to use pre-built images or `docker-compose build` if you want to build your own (see the `Troubleshooting` section in case of errors)
--   `docker-compose up`
+-   `docker compose pull` if you want to use pre-built images or `docker compose build` if you want to build your own (see the `Troubleshooting` section in case of errors)
+-   `docker compose up`
 -   Login to `https://localhost`
     -   User: `admin@admin.test`
     -   Password: `admin`
 
-Keeping the image up-to-date with upstream should be as simple as running `docker-compose pull`.
+Keeping the image up-to-date with upstream should be as simple as running `docker compose pull`.
 
 ### Configuration
 
@@ -133,7 +133,6 @@ Custom root CA certificates can be mounted under `/usr/local/share/ca-certificat
 ## Troubleshooting
 
 -   Make sure you run a fairly recent version of Docker and Docker Compose (if in doubt, update following the steps outlined in https://docs.docker.com/engine/install/ubuntu/)
--   Some Linux distributions provide a recent version of Docker but a legacy version of Docker Compose, so you can try running `docker compose` instead of `docker-compose`
 -   Make sure you are not running an old image or container; when in doubt run `docker system prune --volumes` and clone this repository into an empty directory
 
 ## Versioning
diff --git a/core/files/entrypoint_nginx.sh b/core/files/entrypoint_nginx.sh
index 99ef52c..49720af 100755
--- a/core/files/entrypoint_nginx.sh
+++ b/core/files/entrypoint_nginx.sh
@@ -288,7 +288,9 @@ if [[ -x /custom/files/customize_misp.sh ]]; then
 fi
 
 # Restart PHP workers
+echo "INIT | Configure PHP ..."
 supervisorctl restart php-fpm
+echo "INIT | Done ..."
 
 # Wait for it
 wait "$master_pid"
diff --git a/core/files/etc/misp-docker/initialisation.defaults.json b/core/files/etc/misp-docker/initialisation.defaults.json
index 135715b..9391b06 100644
--- a/core/files/etc/misp-docker/initialisation.defaults.json
+++ b/core/files/etc/misp-docker/initialisation.defaults.json
@@ -80,21 +80,6 @@
   "MISP.event_alert_republish_ban_threshold": {
     "default_value": 120
   },
-  "Plugin.Enrichment_services_enable": {
-    "default_value": true
-  },
-  "Plugin.Import_services_enable": {
-    "default_value": true
-  },
-  "Plugin.Action_services_enable": {
-    "default_value": true
-  },
-  "Plugin.Export_services_enable": {
-    "default_value": true
-  },
-  "Plugin.Cortex_services_enable": {
-    "default_value": false
-  },
   "Security.advanced_authkeys": {
     "default_value": true
   },
diff --git a/core/files/etc/misp-docker/initialisation.envars.json b/core/files/etc/misp-docker/initialisation.envars.json
index adfbe97..b635093 100644
--- a/core/files/etc/misp-docker/initialisation.envars.json
+++ b/core/files/etc/misp-docker/initialisation.envars.json
@@ -12,18 +12,6 @@
   "MISP.contact": {
     "default_value": "${SETTING_CONTACT}"
   },
-  "Plugin.Enrichment_services_url": {
-    "default_value": "${MISP_MODULES_FQDN}"
-  },
-  "Plugin.Import_services_url": {
-    "default_value": "${MISP_MODULES_FQDN}"
-  },
-  "Plugin.Action_services_url": {
-    "default_value": "${MISP_MODULES_FQDN}"
-  },
-  "Plugin.Export_services_url": {
-    "default_value": "${MISP_MODULES_FQDN}"
-  },
   "Security.encryption_key": {
     "default_value": "${ENCRYPTION_KEY}",
     "command_args": "-f"
diff --git a/core/files/etc/misp-docker/optional.defaults.json b/core/files/etc/misp-docker/optional.defaults.json
index 85643db..994f0ce 100644
--- a/core/files/etc/misp-docker/optional.defaults.json
+++ b/core/files/etc/misp-docker/optional.defaults.json
@@ -16,12 +16,27 @@
   "MISP.log_user_ips_authkeys": {
     "default_value": true
   },
+  "Plugin.Enrichment_services_enable": {
+    "default_value": true
+  },
   "Plugin.Enrichment_timeout": {
     "default_value": 30
   },
   "Plugin.Enrichment_hover_timeout": {
     "default_value": 5
   },
+  "Plugin.Import_services_enable": {
+    "default_value": true
+  },
+  "Plugin.Action_services_enable": {
+    "default_value": true
+  },
+  "Plugin.Export_services_enable": {
+    "default_value": true
+  },
+  "Plugin.Cortex_services_enable": {
+    "default_value": false
+  },
   "Plugin.Workflow_enable": {
     "default_value": true
   }
diff --git a/core/files/etc/misp-docker/optional.envars.json b/core/files/etc/misp-docker/optional.envars.json
new file mode 100644
index 0000000..6b2de9f
--- /dev/null
+++ b/core/files/etc/misp-docker/optional.envars.json
@@ -0,0 +1,14 @@
+{
+  "Plugin.Enrichment_services_url": {
+    "default_value": "${MISP_MODULES_FQDN}"
+  },
+  "Plugin.Import_services_url": {
+    "default_value": "${MISP_MODULES_FQDN}"
+  },
+  "Plugin.Export_services_url": {
+    "default_value": "${MISP_MODULES_FQDN}"
+  },
+  "Plugin.Action_services_url": {
+    "default_value": "${MISP_MODULES_FQDN}"
+  }
+}