diff --git a/.docker/aiida-core-base/Dockerfile b/.docker/aiida-core-base/Dockerfile
index 17307203ec..085e100e07 100644
--- a/.docker/aiida-core-base/Dockerfile
+++ b/.docker/aiida-core-base/Dockerfile
@@ -161,6 +161,8 @@ RUN mkdir -p "${CONDA_DIR}/etc/conda/activate.d" && \
 COPY --chown="${SYSTEM_UID}:${SYSTEM_GID}" s6-assets/config-quick-setup.yaml "/aiida/assets/config-quick-setup.yaml"
 COPY s6-assets/s6-rc.d /etc/s6-overlay/s6-rc.d
 COPY s6-assets/init /etc/init
+RUN mkdir /etc/init/run-before-daemon-start && \
+    mkdir /etc/init/run-after-daemon-start
 
 # Otherwise will stuck on oneshot services
 # https://github.com/just-containers/s6-overlay/issues/467
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/aiida-daemon-start/dependencies.d/run-before-daemon-start b/.docker/aiida-core-base/s6-assets/s6-rc.d/aiida-daemon-start/dependencies.d/run-before-daemon-start
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/dependencies.d/aiida-daemon-start b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/dependencies.d/aiida-daemon-start
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/dependencies.d/base b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/timeout-up b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/timeout-up
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/timeout-up
@@ -0,0 +1 @@
+0
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/type b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/type
@@ -0,0 +1 @@
+oneshot
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/up b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/up
new file mode 100644
index 0000000000..d2e95d5190
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-after-daemon-start/up
@@ -0,0 +1,6 @@
+#!/command/execlineb -P
+
+with-contenv
+
+foreground { s6-echo "Calling /etc/init/run-after-daemon-start" }
+run-parts --regex=".*" /etc/init/run-after-daemon-start/
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/dependencies.d/aiida-prepare b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/dependencies.d/aiida-prepare
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/dependencies.d/base b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/timeout-up b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/timeout-up
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/timeout-up
@@ -0,0 +1 @@
+0
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/type b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/type
@@ -0,0 +1 @@
+oneshot
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/up b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/up
new file mode 100644
index 0000000000..3ff7dc0360
--- /dev/null
+++ b/.docker/aiida-core-base/s6-assets/s6-rc.d/run-before-daemon-start/up
@@ -0,0 +1,6 @@
+#!/command/execlineb -P
+
+with-contenv
+
+foreground { s6-echo "Calling /etc/init/run-before-daemon-start" }
+run-parts --regex=".*" /etc/init/run-before-daemon-start/
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/user/contents.d/run-after-daemon-start b/.docker/aiida-core-base/s6-assets/s6-rc.d/user/contents.d/run-after-daemon-start
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.docker/aiida-core-base/s6-assets/s6-rc.d/user/contents.d/run-before-daemon-start b/.docker/aiida-core-base/s6-assets/s6-rc.d/user/contents.d/run-before-daemon-start
new file mode 100644
index 0000000000..e69de29bb2