diff --git a/.ansible-ci/vars/state/ansible-docker-ci.yml b/.ansible-ci/vars/state/ansible-docker-ci.yml
index 0a6ff8a3..31298d3e 100644
--- a/.ansible-ci/vars/state/ansible-docker-ci.yml
+++ b/.ansible-ci/vars/state/ansible-docker-ci.yml
@@ -3,7 +3,7 @@
 #
 ansible_docker_ci_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:943b2b086a67110804b7354ee46929c3c5f0cf127f7a800ae618598a9c3c0d92"
   repo_digest: "quay.io/krestomatio/ansible-docker-ci@sha256:3f34d6135b5becbe0c8598cd597d5d1168df5a318768db22e956805ca12a52aa"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/ansible-operator-ci.yml b/.ansible-ci/vars/state/ansible-operator-ci.yml
index dfab6576..374b9f04 100644
--- a/.ansible-ci/vars/state/ansible-operator-ci.yml
+++ b/.ansible-ci/vars/state/ansible-operator-ci.yml
@@ -3,7 +3,7 @@
 #
 ansible_operator_ci_image:
   build: False
-  tag: "0.1.24"
+  tag: "0.1.25"
   id: "sha256:f0e71d02fcf229674c575f952aa643de3991fefb7250b36a93577e6d689fe505"
   repo_digest: "quay.io/krestomatio/ansible-operator-ci@sha256:41376bdad4a41eebc87248707a7a5b8610dcfc3c1d7ec1c44300fc18132cf7a4"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/ansible-podman-ci.yml b/.ansible-ci/vars/state/ansible-podman-ci.yml
index d556a91a..74dd79ff 100644
--- a/.ansible-ci/vars/state/ansible-podman-ci.yml
+++ b/.ansible-ci/vars/state/ansible-podman-ci.yml
@@ -3,7 +3,7 @@
 #
 ansible_podman_ci_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:eee67f07c1f3a0e95b5067f1ecac0be200e39007be2401f5520e59e7b37214eb"
   repo_digest: "quay.io/krestomatio/ansible-podman-ci@sha256:488b98264befdf20784f18976cf70bf3218b17a0fc043455d5b3774341593214"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/ansible.yml b/.ansible-ci/vars/state/ansible.yml
index d2e5552f..4d8704c9 100644
--- a/.ansible-ci/vars/state/ansible.yml
+++ b/.ansible-ci/vars/state/ansible.yml
@@ -3,7 +3,7 @@
 #
 ansible_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:21fa53c58e81c7b9e74734da32d0379cdbddfb0a6b4a83e845c51850a95eb2b8"
   repo_digest: "quay.io/krestomatio/ansible@sha256:b0024bdb3709fefc5eaef01c56788d565d0e64881cff0481890667e8a2769c12"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/base-stream.yml b/.ansible-ci/vars/state/base-stream.yml
index b1587f2b..e332d11b 100644
--- a/.ansible-ci/vars/state/base-stream.yml
+++ b/.ansible-ci/vars/state/base-stream.yml
@@ -3,7 +3,7 @@
 #
 base_stream_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:fdbca8d8885136f9d33855870112d63af13c61500ab8444fde23fde438c52332"
   repo_digest: "quay.io/krestomatio/base-stream@sha256:5e2f97dc465aab3c195665cc4a642de9ec38572c6157734c572ea4b39bdc80f7"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/base.yml b/.ansible-ci/vars/state/base.yml
index 0200c05c..97d2229c 100644
--- a/.ansible-ci/vars/state/base.yml
+++ b/.ansible-ci/vars/state/base.yml
@@ -3,7 +3,7 @@
 #
 base_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:a20da9867364cffde735814062f5831f9fcd0d0c177e0573ba17f2c5be89b139"
   repo_digest: "quay.io/krestomatio/base@sha256:8f14ef6d0cfb51b5e66e42bdb2c7ba6eca3807fad213d237d23bf78b3802434b"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/centos8-minimal.yml b/.ansible-ci/vars/state/centos8-minimal.yml
index 3248b37e..232df7cf 100644
--- a/.ansible-ci/vars/state/centos8-minimal.yml
+++ b/.ansible-ci/vars/state/centos8-minimal.yml
@@ -6,4 +6,4 @@ centos8_minimal_image:
   tag: "8.4.1"
   id: "sha256:38fc43227ddbd00a312c43532a1660f49503bb9bff9f949ec263d2d31e1131e3"
   repo_digest: "quay.io/krestomatio/centos8-minimal@sha256:217f21e4c5f1b7456de9e46769fea293d017130d52666c0f0381b3a120a05c3f"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/centos8-stream-minimal.yml b/.ansible-ci/vars/state/centos8-stream-minimal.yml
index 861fb3fc..fa0d8000 100644
--- a/.ansible-ci/vars/state/centos8-stream-minimal.yml
+++ b/.ansible-ci/vars/state/centos8-stream-minimal.yml
@@ -6,4 +6,4 @@ centos8_stream_minimal_image:
   tag: "8.5.3"
   id: "sha256:da66371dea42ff0c9098f8fd938f9e538ec83fbe1bc36a455c4967c35a4b4bb3"
   repo_digest: "quay.io/krestomatio/centos8-stream-minimal@sha256:b611e2a806434b2e699154f50bd751fc1d4c4c25a90d1df4d8e51073dddc9b51"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/go-toolset.yml b/.ansible-ci/vars/state/go-toolset.yml
index dd55d047..9ab9eedb 100644
--- a/.ansible-ci/vars/state/go-toolset.yml
+++ b/.ansible-ci/vars/state/go-toolset.yml
@@ -3,7 +3,7 @@
 #
 go_toolset_image:
   build: False
-  tag: "0.0.5"
+  tag: "0.0.6"
   id: "sha256:d8d8f3a237be9b71d8090686bf74cd66f8f39822a30e983df76ee05f940e8bf2"
   repo_digest: "quay.io/krestomatio/go-toolset@sha256:4a85a67e1d808b21158dfbe787a8dd1f888fa25ecbb63eba6efb21b10d654090"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/graphql-engine-base.yml b/.ansible-ci/vars/state/graphql-engine-base.yml
index 02fba7e2..1b468a25 100644
--- a/.ansible-ci/vars/state/graphql-engine-base.yml
+++ b/.ansible-ci/vars/state/graphql-engine-base.yml
@@ -6,4 +6,4 @@ graphql_engine_base_image:
   tag: "2.0.7"
   id: "sha256:9a39c9651f2dd7ab54ae163b1a06ec099518963d83971f5dae4d84a42b59dcc2"
   repo_digest: "quay.io/krestomatio/graphql-engine-base@sha256:84ef97c4197ef5ed06b045e04c486d905afb49275de5b25e4c73009ab383dfdd"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/graphql-engine.yml b/.ansible-ci/vars/state/graphql-engine.yml
index 08ff6a1d..b0bae2f9 100644
--- a/.ansible-ci/vars/state/graphql-engine.yml
+++ b/.ansible-ci/vars/state/graphql-engine.yml
@@ -6,4 +6,4 @@ graphql_engine_image:
   tag: "2.0.7"
   id: "sha256:1718a730fe9ddf4f1adebc25df3684d2581cdc8a23302b99a045cd03d42945c7"
   repo_digest: "quay.io/krestomatio/graphql-engine@sha256:915ca08eeb757884f86b0ffe6c6ebad4782ac2f09e045db62d1d13427914d738"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/httpd.yml b/.ansible-ci/vars/state/httpd.yml
index 145d27c3..28dd354b 100644
--- a/.ansible-ci/vars/state/httpd.yml
+++ b/.ansible-ci/vars/state/httpd.yml
@@ -3,7 +3,7 @@
 #
 httpd_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:339990f49a819b514fbb996eb78f909d213645a8009ab90b5624cd4b7fa753e7"
   repo_digest: "quay.io/krestomatio/httpd@sha256:3262a95b5b07701990063d9e8ac5d055829ebc10d755ff2d994c30182c8398ba"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_app.yml b/.ansible-ci/vars/state/moodle_app.yml
index 2bb890f5..fcdd27de 100644
--- a/.ansible-ci/vars/state/moodle_app.yml
+++ b/.ansible-ci/vars/state/moodle_app.yml
@@ -4,6 +4,6 @@
 moodle_app_image:
   build: False
   tag: "3.9.9"
-  id: "sha256:86910665b8015cf69e1a167f529fcec945b1adc99a0e8b707c6f8ea67a01e3a5"
-  repo_digest: "quay.io/krestomatio/moodle_app@sha256:a8d8f34c7b0bb34955d901d059af70199b744b1dc47ea2008b21232c8c0ab8b6"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  id: "sha256:35547b02bbb758cdb2717eb129f8f39ab3534d42037885dfd300d6daf5713ac8"
+  repo_digest: "quay.io/krestomatio/moodle_app@sha256:4cf090c9be45ca1b65c554ea760d8ed912143d294779d2c0056a4e994be9803a"
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_httpd.yml b/.ansible-ci/vars/state/moodle_httpd.yml
index 40340478..b39ce7e7 100644
--- a/.ansible-ci/vars/state/moodle_httpd.yml
+++ b/.ansible-ci/vars/state/moodle_httpd.yml
@@ -3,7 +3,7 @@
 #
 moodle_httpd_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:83842af621fdd313869225df0ccd8a1de10f8ce81859a7055e884eefb2edfabd"
   repo_digest: "quay.io/krestomatio/moodle_httpd@sha256:119104a207f27803bec7528d9c8dd254d46d7430925ada7021ed0bb9d4e5dafb"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_nginx.yml b/.ansible-ci/vars/state/moodle_nginx.yml
index 99cbc185..0f3093c6 100644
--- a/.ansible-ci/vars/state/moodle_nginx.yml
+++ b/.ansible-ci/vars/state/moodle_nginx.yml
@@ -3,7 +3,7 @@
 #
 moodle_nginx_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:6f5aec5635856f9aa874bb725b987e4e39253268a68c17526ab8c702f6b40832"
   repo_digest: "quay.io/krestomatio/moodle_nginx@sha256:68d723a386a74af986987548ce5b61179ef1dc0320efb8559b7e2b05b4bb2f3f"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_nginx_web.yml b/.ansible-ci/vars/state/moodle_nginx_web.yml
index fb0d6646..fb944c13 100644
--- a/.ansible-ci/vars/state/moodle_nginx_web.yml
+++ b/.ansible-ci/vars/state/moodle_nginx_web.yml
@@ -3,7 +3,7 @@
 #
 moodle_nginx_web_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:39984e62deed1ee0e1834490a0121ba8cd3df7a801eb1e2a84c475a745544a21"
   repo_digest: "quay.io/krestomatio/moodle_nginx_web@sha256:8a0b6d9fe3c6de22697e47dd33293866fd6915c4b2bec28d0bd654d7648c2749"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_php-fpm.yml b/.ansible-ci/vars/state/moodle_php-fpm.yml
index b5ca7cfa..2b962b9d 100644
--- a/.ansible-ci/vars/state/moodle_php-fpm.yml
+++ b/.ansible-ci/vars/state/moodle_php-fpm.yml
@@ -3,7 +3,7 @@
 #
 moodle_php_fpm_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:9d8a2b30efbe6f90217cec1c9386e30bb7004c0f2073c729f1a112ed9eefd72d"
   repo_digest: "quay.io/krestomatio/moodle_php-fpm@sha256:674f0dbda0fc43598e8365c5a53649adc3987eed9dd2a646cc01fa06c48ad761"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/moodle_web.yml b/.ansible-ci/vars/state/moodle_web.yml
index af584be4..aed443ba 100644
--- a/.ansible-ci/vars/state/moodle_web.yml
+++ b/.ansible-ci/vars/state/moodle_web.yml
@@ -4,6 +4,6 @@
 moodle_web_image:
   build: False
   tag: "3.9.9"
-  id: "sha256:1c9618703471419a9022751f43b3bba81cd751e10a2b316bdbda2be855473271"
-  repo_digest: "quay.io/krestomatio/moodle_web@sha256:94d0313fd9f0d91e5efa8e27eeae61ba9d9a69fe674441ec55b88a4fb09e7dbb"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  id: "sha256:2f961094301e0a3894892141d341f2123cdbf3473bbc9db7fe726f49d67538d6"
+  repo_digest: "quay.io/krestomatio/moodle_web@sha256:d0ac2fb7ba268b129aff46fb28e5b1bcebb2eb496dded46a012b195d7104749d"
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/nginx.yml b/.ansible-ci/vars/state/nginx.yml
index a1540f6e..db4e3ec9 100644
--- a/.ansible-ci/vars/state/nginx.yml
+++ b/.ansible-ci/vars/state/nginx.yml
@@ -3,7 +3,7 @@
 #
 nginx_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:7fe61943079cfd69991f8b5fdf8ba9d8b6ad77d784ec11b47047fd77ab7dded1"
   repo_digest: "quay.io/krestomatio/nginx@sha256:ef14942fd15230ac347724c508df3c81e16dfbc58b166f26bfe4f2f55d1c8319"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/nginx_php-fpm.yml b/.ansible-ci/vars/state/nginx_php-fpm.yml
index 1e0f57ca..95ac964a 100644
--- a/.ansible-ci/vars/state/nginx_php-fpm.yml
+++ b/.ansible-ci/vars/state/nginx_php-fpm.yml
@@ -3,7 +3,7 @@
 #
 nginx_php_fpm_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:694c65b03b36d97dd996ab9dd0ba5d0dc6d4a42d6bbc7f7a49d943afcabbe2bd"
   repo_digest: "quay.io/krestomatio/nginx_php-fpm@sha256:a4c755d1050a96954f1d18f4c005139d1051f29b3ad6f8958a929b90467bfe52"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/php-fpm.yml b/.ansible-ci/vars/state/php-fpm.yml
index 72200602..6322d6c0 100644
--- a/.ansible-ci/vars/state/php-fpm.yml
+++ b/.ansible-ci/vars/state/php-fpm.yml
@@ -3,7 +3,7 @@
 #
 php_fpm_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:824bb60606d7028ed5320f37bd15e474d4f421b5b6a40f8061272cc550dd5fb8"
   repo_digest: "quay.io/krestomatio/php-fpm@sha256:a181e5e27d7491565a6a4804404a9de05aa0a2612a148eae8928a25b909e2e52"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/postgres.yml b/.ansible-ci/vars/state/postgres.yml
index 06a44e41..7ff0a46b 100644
--- a/.ansible-ci/vars/state/postgres.yml
+++ b/.ansible-ci/vars/state/postgres.yml
@@ -3,7 +3,7 @@
 #
 postgres_image:
   build: False
-  tag: "0.1.23"
+  tag: "0.1.24"
   id: "sha256:b18590d05f03f3d4eee394f1eab75f46fc62cf1f80aadd4362f3720c771f6d82"
   repo_digest: "quay.io/krestomatio/postgres@sha256:d58e072a5b6084639a9d7180fa702471accd7d17bbf2059635a1b49d359ff929"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/rocky8-minimal.yml b/.ansible-ci/vars/state/rocky8-minimal.yml
index 979b3dbf..b1d2299b 100644
--- a/.ansible-ci/vars/state/rocky8-minimal.yml
+++ b/.ansible-ci/vars/state/rocky8-minimal.yml
@@ -6,4 +6,4 @@ rocky8_minimal_image:
   tag: "8.4.32"
   id: "sha256:ca8786e263016dc1023321855709e8fd4da35f66d78f6c7bb88a55d5eb090eb3"
   repo_digest: "quay.io/krestomatio/rocky8-minimal@sha256:2f1d8fc3b8b7ec0eb7a51089fbe97fa26cda117e9560f230c3da2a190146b882"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.ansible-ci/vars/state/rootfs-creator.yml b/.ansible-ci/vars/state/rootfs-creator.yml
index de23cf2b..52a070dd 100644
--- a/.ansible-ci/vars/state/rootfs-creator.yml
+++ b/.ansible-ci/vars/state/rootfs-creator.yml
@@ -3,7 +3,7 @@
 #
 rootfs_creator_image:
   build: False
-  tag: "0.1.14"
+  tag: "0.1.15"
   id: "sha256:4fe8b7ef9abc68c9f33e0f29c11f2bbc85eb7297c1fffe6157a5563b96b606f4"
   repo_digest: "quay.io/krestomatio/rootfs-creator@sha256:31f9ad02960ee9432251b0350afe0deed733c9feb35b29fd1de40b9bd1d933c2"
-  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
+  artifact_tag: 393dd97d0d490dca829010b31375fec6c300eaa0
diff --git a/.lighthouse/updatebot-m4e.yaml b/.lighthouse/updatebot-m4e.yaml
index f3491669..62546a91 100644
--- a/.lighthouse/updatebot-m4e.yaml
+++ b/.lighthouse/updatebot-m4e.yaml
@@ -11,7 +11,7 @@ spec:
         args:
         - -c
         - |
-          moodle_web_image='quay.io/krestomatio/moodle_web@sha256:94d0313fd9f0d91e5efa8e27eeae61ba9d9a69fe674441ec55b88a4fb09e7dbb'
+          moodle_web_image='quay.io/krestomatio/moodle_web@sha256:d0ac2fb7ba268b129aff46fb28e5b1bcebb2eb496dded46a012b195d7104749d'
           sed -i \
             "s#^moodle_image:.*#moodle_image: ${moodle_web_image//@/\\@}#" \
             roles/v1alpha1/m4e/m4e/defaults/main/moodle.yml
@@ -24,4 +24,14 @@ spec:
           postgres_image='quay.io/krestomatio/postgres@sha256:d58e072a5b6084639a9d7180fa702471accd7d17bbf2059635a1b49d359ff929'
           sed -i \
             "s#^postgres_image:.*#postgres_image: ${postgres_image//@/\\@}#" \
-            roles/v1alpha1/m4e/m4e/defaults/main/postgres.yml
+            roles/v1alpha1/database/postgres/defaults/main/postgres.yml
+    - command:
+        # update Nginx image and its tag
+        name: bash
+        args:
+        - -c
+        - |
+          nginx_image='quay.io/krestomatio/nginx@sha256:ef14942fd15230ac347724c508df3c81e16dfbc58b166f26bfe4f2f55d1c8319'
+          sed -i \
+            "s#^nginx_image:.*#nginx_image: ${nginx_image//@/\\@}#" \
+            roles/v1alpha1/web/nginx/defaults/main/nginx.yml
diff --git a/README.md b/README.md
index 7bd906f0..e4e248a3 100644
--- a/README.md
+++ b/README.md
@@ -4,31 +4,31 @@ This project builds containers using Ansible. The containers are defined as host
 ### Containers build info
 | Container Directory  | Container Image  | Version  |
 |---|---|---|
-| [ansible-docker-ci](ansible-docker-ci/ )| [quay.io/krestomatio/ansible-docker-ci](https://quay.io/krestomatio/ansible-docker-ci) | 0.1.23 |
-| [ansible-operator-ci](ansible-operator-ci/ )| [quay.io/krestomatio/ansible-operator-ci](https://quay.io/krestomatio/ansible-operator-ci) | 0.1.24 |
-| [ansible-podman-ci](ansible-podman-ci/ )| [quay.io/krestomatio/ansible-podman-ci](https://quay.io/krestomatio/ansible-podman-ci) | 0.1.23 |
-| [ansible](ansible/ )| [quay.io/krestomatio/ansible](https://quay.io/krestomatio/ansible) | 0.1.23 |
-| [base-stream](base-stream/ )| [quay.io/krestomatio/base-stream](https://quay.io/krestomatio/base-stream) | 0.1.23 |
-| [base](base/ )| [quay.io/krestomatio/base](https://quay.io/krestomatio/base) | 0.1.23 |
+| [ansible-docker-ci](ansible-docker-ci/ )| [quay.io/krestomatio/ansible-docker-ci](https://quay.io/krestomatio/ansible-docker-ci) | 0.1.24 |
+| [ansible-operator-ci](ansible-operator-ci/ )| [quay.io/krestomatio/ansible-operator-ci](https://quay.io/krestomatio/ansible-operator-ci) | 0.1.25 |
+| [ansible-podman-ci](ansible-podman-ci/ )| [quay.io/krestomatio/ansible-podman-ci](https://quay.io/krestomatio/ansible-podman-ci) | 0.1.24 |
+| [ansible](ansible/ )| [quay.io/krestomatio/ansible](https://quay.io/krestomatio/ansible) | 0.1.24 |
+| [base-stream](base-stream/ )| [quay.io/krestomatio/base-stream](https://quay.io/krestomatio/base-stream) | 0.1.24 |
+| [base](base/ )| [quay.io/krestomatio/base](https://quay.io/krestomatio/base) | 0.1.24 |
 | [centos8-minimal](centos8-minimal/ )| [quay.io/krestomatio/centos8-minimal](https://quay.io/krestomatio/centos8-minimal) | 8.4.1 |
 | [centos8-stream-minimal](centos8-stream-minimal/ )| [quay.io/krestomatio/centos8-stream-minimal](https://quay.io/krestomatio/centos8-stream-minimal) | 8.5.3 |
-| [go-toolset](go-toolset/ )| [quay.io/krestomatio/go-toolset](https://quay.io/krestomatio/go-toolset) | 0.0.5 |
+| [go-toolset](go-toolset/ )| [quay.io/krestomatio/go-toolset](https://quay.io/krestomatio/go-toolset) | 0.0.6 |
 | [graphql-engine-base](graphql-engine-base/ )| [quay.io/krestomatio/graphql-engine-base](https://quay.io/krestomatio/graphql-engine-base) | 2.0.7 |
 | [graphql-engine-build](graphql-engine-build/ )| [quay.io/krestomatio/graphql-engine-build](https://quay.io/krestomatio/graphql-engine-build) | 2.0.7 |
 | [graphql-engine](graphql-engine/ )| [quay.io/krestomatio/graphql-engine](https://quay.io/krestomatio/graphql-engine) | 2.0.7 |
-| [httpd](httpd/ )| [quay.io/krestomatio/httpd](https://quay.io/krestomatio/httpd) | 0.1.23 |
+| [httpd](httpd/ )| [quay.io/krestomatio/httpd](https://quay.io/krestomatio/httpd) | 0.1.24 |
 | [moodle_app](moodle_app/ )| [quay.io/krestomatio/moodle_app](https://quay.io/krestomatio/moodle_app) | 3.9.9 |
-| [moodle_httpd](moodle_httpd/ )| [quay.io/krestomatio/moodle_httpd](https://quay.io/krestomatio/moodle_httpd) | 0.1.23 |
-| [moodle_nginx_web](moodle_nginx_web/ )| [quay.io/krestomatio/moodle_nginx_web](https://quay.io/krestomatio/moodle_nginx_web) | 0.1.23 |
-| [moodle_nginx](moodle_nginx/ )| [quay.io/krestomatio/moodle_nginx](https://quay.io/krestomatio/moodle_nginx) | 0.1.23 |
-| [moodle_php-fpm](moodle_php-fpm/ )| [quay.io/krestomatio/moodle_php-fpm](https://quay.io/krestomatio/moodle_php-fpm) | 0.1.23 |
+| [moodle_httpd](moodle_httpd/ )| [quay.io/krestomatio/moodle_httpd](https://quay.io/krestomatio/moodle_httpd) | 0.1.24 |
+| [moodle_nginx](moodle_nginx/ )| [quay.io/krestomatio/moodle_nginx](https://quay.io/krestomatio/moodle_nginx) | 0.1.24 |
+| [moodle_nginx_web](moodle_nginx_web/ )| [quay.io/krestomatio/moodle_nginx_web](https://quay.io/krestomatio/moodle_nginx_web) | 0.1.24 |
+| [moodle_php-fpm](moodle_php-fpm/ )| [quay.io/krestomatio/moodle_php-fpm](https://quay.io/krestomatio/moodle_php-fpm) | 0.1.24 |
 | [moodle_web](moodle_web/ )| [quay.io/krestomatio/moodle_web](https://quay.io/krestomatio/moodle_web) | 3.9.9 |
-| [nginx_php-fpm](nginx_php-fpm/ )| [quay.io/krestomatio/nginx_php-fpm](https://quay.io/krestomatio/nginx_php-fpm) | 0.1.23 |
-| [nginx](nginx/ )| [quay.io/krestomatio/nginx](https://quay.io/krestomatio/nginx) | 0.1.23 |
-| [php-fpm](php-fpm/ )| [quay.io/krestomatio/php-fpm](https://quay.io/krestomatio/php-fpm) | 0.1.23 |
-| [postgres](postgres/ )| [quay.io/krestomatio/postgres](https://quay.io/krestomatio/postgres) | 0.1.23 |
+| [nginx](nginx/ )| [quay.io/krestomatio/nginx](https://quay.io/krestomatio/nginx) | 0.1.24 |
+| [nginx_php-fpm](nginx_php-fpm/ )| [quay.io/krestomatio/nginx_php-fpm](https://quay.io/krestomatio/nginx_php-fpm) | 0.1.24 |
+| [php-fpm](php-fpm/ )| [quay.io/krestomatio/php-fpm](https://quay.io/krestomatio/php-fpm) | 0.1.24 |
+| [postgres](postgres/ )| [quay.io/krestomatio/postgres](https://quay.io/krestomatio/postgres) | 0.1.24 |
 | [rocky8-minimal](rocky8-minimal/ )| [quay.io/krestomatio/rocky8-minimal](https://quay.io/krestomatio/rocky8-minimal) | 8.4.32 |
-| [rootfs-creator](rootfs-creator/ )| [quay.io/krestomatio/rootfs-creator](https://quay.io/krestomatio/rootfs-creator) | 0.1.14 |
+| [rootfs-creator](rootfs-creator/ )| [quay.io/krestomatio/rootfs-creator](https://quay.io/krestomatio/rootfs-creator) | 0.1.15 |
 
 ### How to build them?
 ```bash
diff --git a/moodle_app/Dockerfile b/moodle_app/Dockerfile
index 32dbb08e..6c3e6775 100644
--- a/moodle_app/Dockerfile
+++ b/moodle_app/Dockerfile
@@ -8,7 +8,7 @@ ENV IMAGE_NAME=moodle_app \
     IMAGE_TITLE="Moodle ${MOODLE_VERSION}" \
     MOODLE_VERSION="3.9" \
     MOODLE_VERSION_SHORT="39" \
-    MOODLE_VERSION_NUMBER="2020061509.02"
+    MOODLE_VERSION_NUMBER="2020061509.03"
 
 # Container variables
 ENV CTR_USER=apache \
@@ -34,7 +34,7 @@ WORKDIR ${GIT_DEST}
 
 # source variables
 ENV GIT_BRANCH="MOODLE_39_STABLE" \
-    GIT_COMMIT="fdb7aa8035b1d1f4d0af0b2361b6ba10acf8497d" \
+    GIT_COMMIT="361070ef5da159bd9a10369d1d19daa856384219" \
     GIT_REMOTE="git://github.com/moodle/moodle"
 
 # verify it has changed
diff --git a/moodle_app/version.json b/moodle_app/version.json
index 60db5ff7..4042a915 100644
--- a/moodle_app/version.json
+++ b/moodle_app/version.json
@@ -1 +1 @@
-{"ref": "refs/heads/MOODLE_39_STABLE", "node_id": "MDM6UmVmNDM5ODYxOnJlZnMvaGVhZHMvTU9PRExFXzM5X1NUQUJMRQ==", "url": "https://api.github.com/repos/moodle/moodle/git/refs/heads/MOODLE_39_STABLE", "object": {"sha": "fdb7aa8035b1d1f4d0af0b2361b6ba10acf8497d", "type": "commit", "url": "https://api.github.com/repos/moodle/moodle/git/commits/fdb7aa8035b1d1f4d0af0b2361b6ba10acf8497d"}}
\ No newline at end of file
+{"ref": "refs/heads/MOODLE_39_STABLE", "node_id": "MDM6UmVmNDM5ODYxOnJlZnMvaGVhZHMvTU9PRExFXzM5X1NUQUJMRQ==", "url": "https://api.github.com/repos/moodle/moodle/git/refs/heads/MOODLE_39_STABLE", "object": {"sha": "361070ef5da159bd9a10369d1d19daa856384219", "type": "commit", "url": "https://api.github.com/repos/moodle/moodle/git/commits/361070ef5da159bd9a10369d1d19daa856384219"}}
\ No newline at end of file
diff --git a/moodle_web/Dockerfile b/moodle_web/Dockerfile
index efc7c3b6..e11782f3 100644
--- a/moodle_web/Dockerfile
+++ b/moodle_web/Dockerfile
@@ -1,6 +1,6 @@
 # Ansible managed
 FROM quay.io/krestomatio/moodle_app AS app
-ENV GIT_COMMIT=fdb7aa8035b1d1f4d0af0b2361b6ba10acf8497d
+ENV GIT_COMMIT=361070ef5da159bd9a10369d1d19daa856384219
 RUN app-git -v -a -e '.git*'
 
 FROM quay.io/krestomatio/moodle_nginx_web
@@ -38,8 +38,8 @@ RUN container-setup-php-moodle
 
 USER ${CTR_USER_ID}
 
-ENV MOODLE_COMMIT="fdb7aa8035b1d1f4d0af0b2361b6ba10acf8497d" \
-    MOODLE_VERSION_NUMBER="2020061509.02"
+ENV MOODLE_COMMIT="361070ef5da159bd9a10369d1d19daa856384219" \
+    MOODLE_VERSION_NUMBER="2020061509.03"
 
 COPY --chown=${CTR_USER_ID}:0 --from=app /var/www/html/ /var/www/html