diff --git a/.ansible-ci/vars/state/ansible-docker-ci.yml b/.ansible-ci/vars/state/ansible-docker-ci.yml
index 0cafb6ef..0a6ff8a3 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.22"
-  id: "sha256:9872dc604274efd480dd6b7d6a97d8406f27769b01a2ef6fae532c0c5cd10df8"
-  repo_digest: "quay.io/krestomatio/ansible-docker-ci@sha256:3dd12b7e03abb2c88aaba4eb3d99a3b1bc6f0ce7ad4028183641ca7dd2d75dd4"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:943b2b086a67110804b7354ee46929c3c5f0cf127f7a800ae618598a9c3c0d92"
+  repo_digest: "quay.io/krestomatio/ansible-docker-ci@sha256:3f34d6135b5becbe0c8598cd597d5d1168df5a318768db22e956805ca12a52aa"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/ansible-operator-ci.yml b/.ansible-ci/vars/state/ansible-operator-ci.yml
index 80cf9f85..dfab6576 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.23"
-  id: "sha256:d21a32eeb9cd6ba3a8fd19645ced30a1ca6332531fc8b6ac8b47641d99934456"
-  repo_digest: "quay.io/krestomatio/ansible-operator-ci@sha256:c4d870ccb3040e4cbe39ce76942d0ee339b248739d008dbb641368c5ff95f687"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.24"
+  id: "sha256:f0e71d02fcf229674c575f952aa643de3991fefb7250b36a93577e6d689fe505"
+  repo_digest: "quay.io/krestomatio/ansible-operator-ci@sha256:41376bdad4a41eebc87248707a7a5b8610dcfc3c1d7ec1c44300fc18132cf7a4"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/ansible-podman-ci.yml b/.ansible-ci/vars/state/ansible-podman-ci.yml
index bd07d307..d556a91a 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.22"
-  id: "sha256:0d99f0808b29798957837bbf3f9b8ef29345cebefdf4c6370b00138a5ad6b82d"
-  repo_digest: "quay.io/krestomatio/ansible-podman-ci@sha256:193fccc93e6d74f334354ea94017c387ae087c89893a7f84cf64fc0f65e11ddb"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:eee67f07c1f3a0e95b5067f1ecac0be200e39007be2401f5520e59e7b37214eb"
+  repo_digest: "quay.io/krestomatio/ansible-podman-ci@sha256:488b98264befdf20784f18976cf70bf3218b17a0fc043455d5b3774341593214"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/ansible.yml b/.ansible-ci/vars/state/ansible.yml
index 886318e8..d2e5552f 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.22"
-  id: "sha256:ee718f33dc227b1ef801c5a8ea7e704cc317bac0817243d419474a0fe8dd0086"
-  repo_digest: "quay.io/krestomatio/ansible@sha256:63bd4d6f79853630d79365e724b646b7d00e4cd2bfd30e0261efa9db44873d03"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.23"
+  id: "sha256:21fa53c58e81c7b9e74734da32d0379cdbddfb0a6b4a83e845c51850a95eb2b8"
+  repo_digest: "quay.io/krestomatio/ansible@sha256:b0024bdb3709fefc5eaef01c56788d565d0e64881cff0481890667e8a2769c12"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/base-stream.yml b/.ansible-ci/vars/state/base-stream.yml
index 7be84712..b1587f2b 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.22"
-  id: "sha256:93cb86426cb23536ec5d4c8cb6c6dc71f4ccead85df5d5d8f16d94e246bb0718"
-  repo_digest: "quay.io/krestomatio/base-stream@sha256:5899957d0b6be0c5ba1c5ca5574a79bb789ec98fd06ddca90dcefd45602a7dca"
-  artifact_tag: 80fa514c776218b37c57ec1de085ce747fe1fdc4
+  tag: "0.1.23"
+  id: "sha256:fdbca8d8885136f9d33855870112d63af13c61500ab8444fde23fde438c52332"
+  repo_digest: "quay.io/krestomatio/base-stream@sha256:5e2f97dc465aab3c195665cc4a642de9ec38572c6157734c572ea4b39bdc80f7"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/base.yml b/.ansible-ci/vars/state/base.yml
index ea8a99d7..0200c05c 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.22"
-  id: "sha256:f9361d3d92a0e8a37836fc467b83ae65fdccfa08564057bd36f5f85367f5b81a"
-  repo_digest: "quay.io/krestomatio/base@sha256:f60b3fd27bed49275bc3a4e386b2933380443255252e9fbbd6d4353621ca33aa"
-  artifact_tag: 80fa514c776218b37c57ec1de085ce747fe1fdc4
+  tag: "0.1.23"
+  id: "sha256:a20da9867364cffde735814062f5831f9fcd0d0c177e0573ba17f2c5be89b139"
+  repo_digest: "quay.io/krestomatio/base@sha256:8f14ef6d0cfb51b5e66e42bdb2c7ba6eca3807fad213d237d23bf78b3802434b"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/centos8-minimal.yml b/.ansible-ci/vars/state/centos8-minimal.yml
index 0bba035a..3248b37e 100644
--- a/.ansible-ci/vars/state/centos8-minimal.yml
+++ b/.ansible-ci/vars/state/centos8-minimal.yml
@@ -4,6 +4,6 @@
 centos8_minimal_image:
   build: False
   tag: "8.4.1"
-  id: "sha256:3c239139294ded3ee40c8c9adcf1ecb9e8dbaf44ed635705cae6a90dd33887d9"
-  repo_digest: "quay.io/krestomatio/centos8-minimal@sha256:0f135ed285fe83bac7373580f46150ccc5f7f13b61ec0fc16425a3b375f5d6d0"
-  artifact_tag: 80fa514c776218b37c57ec1de085ce747fe1fdc4
+  id: "sha256:38fc43227ddbd00a312c43532a1660f49503bb9bff9f949ec263d2d31e1131e3"
+  repo_digest: "quay.io/krestomatio/centos8-minimal@sha256:217f21e4c5f1b7456de9e46769fea293d017130d52666c0f0381b3a120a05c3f"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/centos8-stream-minimal.yml b/.ansible-ci/vars/state/centos8-stream-minimal.yml
index b3ac500b..861fb3fc 100644
--- a/.ansible-ci/vars/state/centos8-stream-minimal.yml
+++ b/.ansible-ci/vars/state/centos8-stream-minimal.yml
@@ -4,6 +4,6 @@
 centos8_stream_minimal_image:
   build: False
   tag: "8.5.3"
-  id: "sha256:beda810de5dd49363cbf032a924739112c83ff15f753281d7907ad8837685aaf"
-  repo_digest: "quay.io/krestomatio/centos8-stream-minimal@sha256:a949a5faa2b81da8b2aa8cef8a9e7c437e91ad1b2f7ce78c9512b98e9c715cfb"
-  artifact_tag: 80fa514c776218b37c57ec1de085ce747fe1fdc4
+  id: "sha256:da66371dea42ff0c9098f8fd938f9e538ec83fbe1bc36a455c4967c35a4b4bb3"
+  repo_digest: "quay.io/krestomatio/centos8-stream-minimal@sha256:b611e2a806434b2e699154f50bd751fc1d4c4c25a90d1df4d8e51073dddc9b51"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/go-toolset.yml b/.ansible-ci/vars/state/go-toolset.yml
index b5aed7bc..dd55d047 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.4"
-  id: "sha256:d11abee586acf835feb457b7082d50232b0280cc90a6e9878ef192294327214a"
-  repo_digest: "quay.io/krestomatio/go-toolset@sha256:abaf27f47387b24cd7dcf05d6516fd6915405663c5fd72ce62e6d3a93a4d76e6"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.0.5"
+  id: "sha256:d8d8f3a237be9b71d8090686bf74cd66f8f39822a30e983df76ee05f940e8bf2"
+  repo_digest: "quay.io/krestomatio/go-toolset@sha256:4a85a67e1d808b21158dfbe787a8dd1f888fa25ecbb63eba6efb21b10d654090"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/graphql-engine-base.yml b/.ansible-ci/vars/state/graphql-engine-base.yml
index 3ac2fbf8..02fba7e2 100644
--- a/.ansible-ci/vars/state/graphql-engine-base.yml
+++ b/.ansible-ci/vars/state/graphql-engine-base.yml
@@ -4,6 +4,6 @@
 graphql_engine_base_image:
   build: False
   tag: "2.0.7"
-  id: "sha256:17774bc51eef15e99cdc8c92bf7bf213e3c18ed2a7bc466dd524419f5d239460"
-  repo_digest: "quay.io/krestomatio/graphql-engine-base@sha256:a0ac0204bc8df84559e8ef39d380eff7e3e2024feb237f4b66d28a5b10080447"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  id: "sha256:9a39c9651f2dd7ab54ae163b1a06ec099518963d83971f5dae4d84a42b59dcc2"
+  repo_digest: "quay.io/krestomatio/graphql-engine-base@sha256:84ef97c4197ef5ed06b045e04c486d905afb49275de5b25e4c73009ab383dfdd"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/graphql-engine.yml b/.ansible-ci/vars/state/graphql-engine.yml
index bdb4432a..08ff6a1d 100644
--- a/.ansible-ci/vars/state/graphql-engine.yml
+++ b/.ansible-ci/vars/state/graphql-engine.yml
@@ -4,6 +4,6 @@
 graphql_engine_image:
   build: False
   tag: "2.0.7"
-  id: "sha256:2280e55aa69255a717d3745226df2beacddea0380e8c9bb67aaa4e4cb3ea89fa"
-  repo_digest: "quay.io/krestomatio/graphql-engine@sha256:9dbe9438de745566469d52208802f90cb0813cda8b9b8e8265ab297fc8e95bef"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  id: "sha256:1718a730fe9ddf4f1adebc25df3684d2581cdc8a23302b99a045cd03d42945c7"
+  repo_digest: "quay.io/krestomatio/graphql-engine@sha256:915ca08eeb757884f86b0ffe6c6ebad4782ac2f09e045db62d1d13427914d738"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/httpd.yml b/.ansible-ci/vars/state/httpd.yml
index 1f999d07..145d27c3 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.22"
-  id: "sha256:5e2d4599d478741ad9e461d3cf6d8c2d76d2c9eaa6557812a16ee84d17f3de74"
-  repo_digest: "quay.io/krestomatio/httpd@sha256:02eb2e35df1a8dc98d1d70e98142b48d91623220f21a9445da940ac1b0b7f0d2"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.23"
+  id: "sha256:339990f49a819b514fbb996eb78f909d213645a8009ab90b5624cd4b7fa753e7"
+  repo_digest: "quay.io/krestomatio/httpd@sha256:3262a95b5b07701990063d9e8ac5d055829ebc10d755ff2d994c30182c8398ba"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_app.yml b/.ansible-ci/vars/state/moodle_app.yml
index 8d13b1ed..2bb890f5 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:be7b3329ac1e171341052bfe198358fbc2440816502ce3ea93c34a7852e5a954"
-  repo_digest: "quay.io/krestomatio/moodle_app@sha256:a959e2926084f45874c8e7368d6adcb76248968dfe77493183320ea7b95130e5"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  id: "sha256:86910665b8015cf69e1a167f529fcec945b1adc99a0e8b707c6f8ea67a01e3a5"
+  repo_digest: "quay.io/krestomatio/moodle_app@sha256:a8d8f34c7b0bb34955d901d059af70199b744b1dc47ea2008b21232c8c0ab8b6"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_httpd.yml b/.ansible-ci/vars/state/moodle_httpd.yml
index feb35473..40340478 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.22"
-  id: "sha256:8e8507fe8d7ebc3dc3b8bfd7843eb7f4541fcefc48b736275de5b452ca72c1a7"
-  repo_digest: "quay.io/krestomatio/moodle_httpd@sha256:1a1b255c5e53890f030fdf830cb8422ad64d529e561933b3a56abc99bd786537"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:83842af621fdd313869225df0ccd8a1de10f8ce81859a7055e884eefb2edfabd"
+  repo_digest: "quay.io/krestomatio/moodle_httpd@sha256:119104a207f27803bec7528d9c8dd254d46d7430925ada7021ed0bb9d4e5dafb"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_nginx.yml b/.ansible-ci/vars/state/moodle_nginx.yml
index f6076ca5..99cbc185 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.22"
-  id: "sha256:7d31e317edd324afa35ed9d61349830c5a408f495dde632202a85ceaac9e4ec9"
-  repo_digest: "quay.io/krestomatio/moodle_nginx@sha256:de5f3f6509ce492218db33ca9a7cdea7f7757dfb214fdb132e4793665db995b3"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:6f5aec5635856f9aa874bb725b987e4e39253268a68c17526ab8c702f6b40832"
+  repo_digest: "quay.io/krestomatio/moodle_nginx@sha256:68d723a386a74af986987548ce5b61179ef1dc0320efb8559b7e2b05b4bb2f3f"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_nginx_web.yml b/.ansible-ci/vars/state/moodle_nginx_web.yml
index 138cb75e..fb0d6646 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.22"
-  id: "sha256:6e8421a14a30fa688ee8339326cd6239b969057fcffcf5f350010b3ff9a6ec64"
-  repo_digest: "quay.io/krestomatio/moodle_nginx_web@sha256:742e083171516c8ce9a8c3ee4c04a62f6ccf5f97a7827f80e3cde56708ea48c0"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:39984e62deed1ee0e1834490a0121ba8cd3df7a801eb1e2a84c475a745544a21"
+  repo_digest: "quay.io/krestomatio/moodle_nginx_web@sha256:8a0b6d9fe3c6de22697e47dd33293866fd6915c4b2bec28d0bd654d7648c2749"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_php-fpm.yml b/.ansible-ci/vars/state/moodle_php-fpm.yml
index 17c6c033..b5ca7cfa 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.22"
-  id: "sha256:b69a97f02174e430e81948d393c4df1b2d6fd8a43ad1515652561938d4777db8"
-  repo_digest: "quay.io/krestomatio/moodle_php-fpm@sha256:9e5e2396430f6ecfdf97f0203f05591d08343d78a088d6f805960b64d130426b"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:9d8a2b30efbe6f90217cec1c9386e30bb7004c0f2073c729f1a112ed9eefd72d"
+  repo_digest: "quay.io/krestomatio/moodle_php-fpm@sha256:674f0dbda0fc43598e8365c5a53649adc3987eed9dd2a646cc01fa06c48ad761"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/moodle_web.yml b/.ansible-ci/vars/state/moodle_web.yml
index 8d2b6fb8..af584be4 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:7c43960320afb19111dabd621de7af650a65c7d6f655fbf64b859fbdb18a9b52"
-  repo_digest: "quay.io/krestomatio/moodle_web@sha256:e168092082bdfc49ab242991e6168c0535438cca5809c6b09ab3ad46bd624873"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  id: "sha256:1c9618703471419a9022751f43b3bba81cd751e10a2b316bdbda2be855473271"
+  repo_digest: "quay.io/krestomatio/moodle_web@sha256:94d0313fd9f0d91e5efa8e27eeae61ba9d9a69fe674441ec55b88a4fb09e7dbb"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/nginx.yml b/.ansible-ci/vars/state/nginx.yml
index 640b9808..a1540f6e 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.22"
-  id: "sha256:6cb78c83c5a16ba43a6cf56994a94b027c373fd393989f16f3fd3d7973b8f361"
-  repo_digest: "quay.io/krestomatio/nginx@sha256:36a3a3fbcd9bd8ee909180df93b48b51f291a404e83c691b0c496ae294c228a8"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.23"
+  id: "sha256:7fe61943079cfd69991f8b5fdf8ba9d8b6ad77d784ec11b47047fd77ab7dded1"
+  repo_digest: "quay.io/krestomatio/nginx@sha256:ef14942fd15230ac347724c508df3c81e16dfbc58b166f26bfe4f2f55d1c8319"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/nginx_php-fpm.yml b/.ansible-ci/vars/state/nginx_php-fpm.yml
index 340ac617..1e0f57ca 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.22"
-  id: "sha256:d317f10d1e127f5da048663638e7f3936bad5b5e81ff4675119f91d7834a2fd7"
-  repo_digest: "quay.io/krestomatio/nginx_php-fpm@sha256:070398d42bb215a11a54c86593a31974054390ff3c2b2a67b3543c984310ca21"
-  artifact_tag: 412e658cb75abb57a3c0cd3502e8875655bdb698
+  tag: "0.1.23"
+  id: "sha256:694c65b03b36d97dd996ab9dd0ba5d0dc6d4a42d6bbc7f7a49d943afcabbe2bd"
+  repo_digest: "quay.io/krestomatio/nginx_php-fpm@sha256:a4c755d1050a96954f1d18f4c005139d1051f29b3ad6f8958a929b90467bfe52"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/php-fpm.yml b/.ansible-ci/vars/state/php-fpm.yml
index b24eca4b..72200602 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.22"
-  id: "sha256:6a0d10e8907c8f37c6b8a8bff8728e7f05a227173a6d9652c6b87101ed9769c0"
-  repo_digest: "quay.io/krestomatio/php-fpm@sha256:22206c59b78d94eb6bf4842fee8be31bf225f3389cd0133baf62a50b52df826e"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.23"
+  id: "sha256:824bb60606d7028ed5320f37bd15e474d4f421b5b6a40f8061272cc550dd5fb8"
+  repo_digest: "quay.io/krestomatio/php-fpm@sha256:a181e5e27d7491565a6a4804404a9de05aa0a2612a148eae8928a25b909e2e52"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/postgres.yml b/.ansible-ci/vars/state/postgres.yml
index b2b2a272..06a44e41 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.22"
-  id: "sha256:9381dab941b2e2f27545396e2713a8823ba2c5782a0495a267c96f875514b8a0"
-  repo_digest: "quay.io/krestomatio/postgres@sha256:4e713facd55275a300ca8493d28e66f42b60b737caf80afe6af1dc6cdbd32d3f"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.23"
+  id: "sha256:b18590d05f03f3d4eee394f1eab75f46fc62cf1f80aadd4362f3720c771f6d82"
+  repo_digest: "quay.io/krestomatio/postgres@sha256:d58e072a5b6084639a9d7180fa702471accd7d17bbf2059635a1b49d359ff929"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/rocky8-minimal.yml b/.ansible-ci/vars/state/rocky8-minimal.yml
index e0267d6c..979b3dbf 100644
--- a/.ansible-ci/vars/state/rocky8-minimal.yml
+++ b/.ansible-ci/vars/state/rocky8-minimal.yml
@@ -4,6 +4,6 @@
 rocky8_minimal_image:
   build: False
   tag: "8.4.32"
-  id: "sha256:0f31a4098f7f7a6b5dc0b48d4df715c8d570e0b2d96afb7880bb4e1eed4bc851"
-  repo_digest: "quay.io/krestomatio/rocky8-minimal@sha256:d8dc5972e31b2d6d83fa900c412b3f31fd8c06721bbaaecbce17042bb7c73fb4"
-  artifact_tag: 80fa514c776218b37c57ec1de085ce747fe1fdc4
+  id: "sha256:ca8786e263016dc1023321855709e8fd4da35f66d78f6c7bb88a55d5eb090eb3"
+  repo_digest: "quay.io/krestomatio/rocky8-minimal@sha256:2f1d8fc3b8b7ec0eb7a51089fbe97fa26cda117e9560f230c3da2a190146b882"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.ansible-ci/vars/state/rootfs-creator.yml b/.ansible-ci/vars/state/rootfs-creator.yml
index 953340f4..de23cf2b 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.13"
-  id: "sha256:7e683fba6da7db7430ec88549762e688e7679df98c3640258d45698df1176d29"
-  repo_digest: "quay.io/krestomatio/rootfs-creator@sha256:74b7c5037c4018fb70c17e605b7f5ef53dfcf279285df7771be26ebdfc54b3f0"
-  artifact_tag: c0ad7c2d7c71d721ed65626327688b2919e941f7
+  tag: "0.1.14"
+  id: "sha256:4fe8b7ef9abc68c9f33e0f29c11f2bbc85eb7297c1fffe6157a5563b96b606f4"
+  repo_digest: "quay.io/krestomatio/rootfs-creator@sha256:31f9ad02960ee9432251b0350afe0deed733c9feb35b29fd1de40b9bd1d933c2"
+  artifact_tag: 88f032db1730504dc777aac9d1551130950b9ca2
diff --git a/.lighthouse/updatebot-m4e.yaml b/.lighthouse/updatebot-m4e.yaml
index 015ae503..f3491669 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:e168092082bdfc49ab242991e6168c0535438cca5809c6b09ab3ad46bd624873'
+          moodle_web_image='quay.io/krestomatio/moodle_web@sha256:94d0313fd9f0d91e5efa8e27eeae61ba9d9a69fe674441ec55b88a4fb09e7dbb'
           sed -i \
             "s#^moodle_image:.*#moodle_image: ${moodle_web_image//@/\\@}#" \
             roles/v1alpha1/m4e/m4e/defaults/main/moodle.yml
@@ -21,7 +21,7 @@ spec:
         args:
         - -c
         - |
-          postgres_image='quay.io/krestomatio/postgres@sha256:4e713facd55275a300ca8493d28e66f42b60b737caf80afe6af1dc6cdbd32d3f'
+          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
diff --git a/README.md b/README.md
index 9cea42f1..67bdaa9d 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/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-docker-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-docker-ci) | 0.1.22-c0ad7c2 |
-| [ansible-operator-ci](ansible-operator-ci/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-operator-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-operator-ci) | 0.1.23-412e658 |
-| [ansible-podman-ci](ansible-podman-ci/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-podman-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-podman-ci) | 0.1.22-c0ad7c2 |
-| [ansible](ansible/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible) | 0.1.22-80fa514 |
-| [base-stream](base-stream/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/base-stream](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/base-stream) | 0.1.22-80fa514 |
-| [base](base/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/base](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/base) | 0.1.22-80fa514 |
-| [centos8-minimal](centos8-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-minimal) | 8.4.1-80fa514 |
-| [centos8-stream-minimal](centos8-stream-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-stream-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-stream-minimal) | 8.5.3-80fa514 |
-| [go-toolset](go-toolset/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/go-toolset](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/go-toolset) | 0.0.4-80fa514 |
-| [graphql-engine-base](graphql-engine-base/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine-base](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine-base) | 2.0.7-80fa514 |
+| [ansible-docker-ci](ansible-docker-ci/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-docker-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-docker-ci) | 0.1.23-88f032d |
+| [ansible-operator-ci](ansible-operator-ci/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-operator-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-operator-ci) | 0.1.24-88f032d |
+| [ansible-podman-ci](ansible-podman-ci/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-podman-ci](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible-podman-ci) | 0.1.23-88f032d |
+| [ansible](ansible/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/ansible) | 0.1.23-88f032d |
+| [base-stream](base-stream/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/base-stream](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/base-stream) | 0.1.23-88f032d |
+| [base](base/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/base](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/base) | 0.1.23-88f032d |
+| [centos8-minimal](centos8-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-minimal) | 8.4.1-88f032d |
+| [centos8-stream-minimal](centos8-stream-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-stream-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/centos8-stream-minimal) | 8.5.3-88f032d |
+| [go-toolset](go-toolset/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/go-toolset](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/go-toolset) | 0.0.5-88f032d |
+| [graphql-engine-base](graphql-engine-base/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine-base](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine-base) | 2.0.7-88f032d |
 | [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/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine) | 2.0.7-412e658 |
-| [httpd](httpd/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/httpd](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/httpd) | 0.1.22-80fa514 |
-| [moodle_app](moodle_app/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_app](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_app) | 3.9.9-412e658 |
-| [moodle_httpd](moodle_httpd/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_httpd](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_httpd) | 0.1.22-412e658 |
-| [moodle_nginx_web](moodle_nginx_web/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx_web](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx_web) | 0.1.22-412e658 |
-| [moodle_nginx](moodle_nginx/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx) | 0.1.22-412e658 |
-| [moodle_php-fpm](moodle_php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_php-fpm) | 0.1.22-412e658 |
-| [moodle_web](moodle_web/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_web](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_web) | 3.9.9-412e658 |
-| [nginx_php-fpm](nginx_php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx_php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx_php-fpm) | 0.1.22-c0ad7c2 |
-| [nginx](nginx/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx) | 0.1.22-80fa514 |
-| [php-fpm](php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/php-fpm) | 0.1.22-80fa514 |
-| [postgres](postgres/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/postgres](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/postgres) | 0.1.22-80fa514 |
-| [rocky8-minimal](rocky8-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/rocky8-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/rocky8-minimal) | 8.4.32-80fa514 |
-| [rootfs-creator](rootfs-creator/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/rootfs-creator](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/rootfs-creator) | 0.1.13-80fa514 |
+| [graphql-engine](graphql-engine/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/graphql-engine) | 2.0.7-88f032d |
+| [httpd](httpd/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/httpd](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/httpd) | 0.1.23-88f032d |
+| [moodle_app](moodle_app/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_app](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_app) | 3.9.9-88f032d |
+| [moodle_httpd](moodle_httpd/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_httpd](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_httpd) | 0.1.23-88f032d |
+| [moodle_nginx](moodle_nginx/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx) | 0.1.23-88f032d |
+| [moodle_nginx_web](moodle_nginx_web/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx_web](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_nginx_web) | 0.1.23-88f032d |
+| [moodle_php-fpm](moodle_php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_php-fpm) | 0.1.23-88f032d |
+| [moodle_web](moodle_web/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_web](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/moodle_web) | 3.9.9-88f032d |
+| [nginx](nginx/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx) | 0.1.23-88f032d |
+| [nginx_php-fpm](nginx_php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx_php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/nginx_php-fpm) | 0.1.23-88f032d |
+| [php-fpm](php-fpm/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/php-fpm](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/php-fpm) | 0.1.23-88f032d |
+| [postgres](postgres/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/postgres](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/postgres) | 0.1.23-88f032d |
+| [rocky8-minimal](rocky8-minimal/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/rocky8-minimal](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/rocky8-minimal) | 8.4.32-88f032d |
+| [rootfs-creator](rootfs-creator/ )| [docker-registry.jx.krestomat.io/krestomatio/container_builder/rootfs-creator](https://docker-registry.jx.krestomat.io/krestomatio/container_builder/rootfs-creator) | 0.1.14-88f032d |
 
 ### How to build them?
 ```bash
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 44e9284c..8e1e0401 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -3,9 +3,9 @@ FROM quay.io/krestomatio/base-stream
 
 # General variables
 ENV IMAGE_NAME=nginx \
-    IMAGE_SUMMARY="Nginx 1.14" \
-    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs Nginx 1.14" \
-    IMAGE_TITLE="Nginx 1.14" \
+    IMAGE_SUMMARY="Nginx 1.18" \
+    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs Nginx 1.18" \
+    IMAGE_TITLE="Nginx 1.18" \
     IMAGE_SERVICE_PORT="8080" \
     IMAGE_SERVICE_NAME="http"
 
@@ -16,8 +16,8 @@ ENV CTR_USER=nginx \
     CTR_STOPSIGNAL=SIGQUIT
 
 # Component bash variables
-ENV NGINX_VERSION="1.14" \
-    NGINX_VER_SHORT="114" \
+ENV NGINX_VERSION="1.18" \
+    NGINX_VER_SHORT="118" \
     NGINX_SYSCONF_PATH=/etc/nginx \
     NGINX_MAIN_CONF_FILE=/etc/nginx/nginx.conf \
     NGINX_MAIN_CONF_D_PATH=/etc/nginx/conf.d \
@@ -30,15 +30,14 @@ ENV NGINX_VERSION="1.14" \
     NGINX_LOG_PATH=/var/log/nginx \
     APP_DEST=/usr/share/nginx/html
 
+ENV OS_INSTALL_PKGS="nginx"
+
 USER 0
 
 COPY conf/usr/bin /usr/bin/
 COPY conf/container-entrypoint.d ${CTR_ENTRYPOINT_OPT_PATH}/
 
-RUN container-setup
-RUN install-pkgs nginx
-
-RUN container-setup-nginx
+RUN container-setup && container-setup-nginx
 
 WORKDIR ${APP_DEST}
 
diff --git a/nginx/conf/usr/bin/container-setup-nginx b/nginx/conf/usr/bin/container-setup-nginx
index 76d8f69b..aae7c745 100755
--- a/nginx/conf/usr/bin/container-setup-nginx
+++ b/nginx/conf/usr/bin/container-setup-nginx
@@ -1,6 +1,10 @@
 #!/bin/bash -e
 # description: base config for nginx
 
+# install pkgs
+microdnf module enable nginx:${NGINX_VERSION}
+install-pkgs ${OS_INSTALL_PKGS}
+
 # persistent user id
 sed "/^${CTR_USER}/d" /etc/passwd | grep -q -w ${CTR_USER_ID} && exit 1 || echo "Setting userid to ${CTR_USER_ID}..."
 sed -i "s@^nginx:.*@nginx:x:${CTR_USER_ID}:${CTR_USER_ID}:Nginx web server:/var/lib/nginx:/sbin/nologin@" /etc/passwd
diff --git a/nginx_php-fpm/Dockerfile b/nginx_php-fpm/Dockerfile
index 6671857a..1cde2f6f 100644
--- a/nginx_php-fpm/Dockerfile
+++ b/nginx_php-fpm/Dockerfile
@@ -3,9 +3,9 @@ FROM quay.io/krestomatio/nginx
 
 # General variables
 ENV IMAGE_NAME=php-fpm \
-    IMAGE_SUMMARY="PHP 7.2" \
-    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs PHP 7.2" \
-    IMAGE_TITLE="PHP 7.2" \
+    IMAGE_SUMMARY="PHP 7.4" \
+    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs PHP 7.4" \
+    IMAGE_TITLE="PHP 7.4" \
     IMAGE_SERVICE_PORT="9000" \
     IMAGE_SERVICE_NAME="php-fpm"
 
@@ -16,8 +16,8 @@ ENV CTR_USER=apache \
     CTR_STOPSIGNAL=SIGQUIT
 
 # Component bash variables
-ENV PHP_VERSION="7.2" \
-    PHP_VER_SHORT="72" \
+ENV PHP_VERSION="7.4" \
+    PHP_VER_SHORT="74" \
     PHP_RUN=/var/run/php-fpm \
     PHP_CONF_DIR=/etc/php.d \
     PHP_CONF_FILE=/etc/php.ini \
@@ -35,10 +35,7 @@ USER 0
 COPY conf/usr/bin /usr/bin/
 COPY conf/container-entrypoint.d ${CTR_ENTRYPOINT_OPT_PATH}/
 
-RUN container-setup
-RUN install-pkgs ${OS_INSTALL_PKGS}
-
-RUN container-setup-php
+RUN container-setup && container-setup-php
 
 WORKDIR ${APP_DEST}
 
diff --git a/nginx_php-fpm/conf/usr/bin/container-setup-php b/nginx_php-fpm/conf/usr/bin/container-setup-php
index d6a081ad..e8d80fd3 100755
--- a/nginx_php-fpm/conf/usr/bin/container-setup-php
+++ b/nginx_php-fpm/conf/usr/bin/container-setup-php
@@ -1,6 +1,10 @@
 #!/bin/bash -e
 # description: base config for php-fpm
 
+# install pkgs
+microdnf module enable php:${PHP_VERSION}
+install-pkgs ${OS_INSTALL_PKGS}
+
 # php-fpm default config
 sed -i \
     -e 's@^error_log.*@error_log = ${PHP_FPM_ERROR_LOG}@' \
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 5f56f43a..57073255 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -3,9 +3,9 @@ FROM quay.io/krestomatio/base-stream
 
 # General variables
 ENV IMAGE_NAME=php-fpm \
-    IMAGE_SUMMARY="PHP 7.2" \
-    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs PHP 7.2" \
-    IMAGE_TITLE="PHP 7.2" \
+    IMAGE_SUMMARY="PHP 7.4" \
+    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs PHP 7.4" \
+    IMAGE_TITLE="PHP 7.4" \
     IMAGE_SERVICE_PORT="9000" \
     IMAGE_SERVICE_NAME="php-fpm"
 
@@ -16,8 +16,8 @@ ENV CTR_USER=apache \
     CTR_STOPSIGNAL=SIGQUIT
 
 # Component bash variables
-ENV PHP_VERSION="7.2" \
-    PHP_VER_SHORT="72" \
+ENV PHP_VERSION="7.4" \
+    PHP_VER_SHORT="74" \
     PHP_RUN=/var/run/php-fpm \
     PHP_CONF_DIR=/etc/php.d \
     PHP_CONF_FILE=/etc/php.ini \
@@ -35,10 +35,7 @@ USER 0
 COPY conf/usr/bin /usr/bin/
 COPY conf/container-entrypoint.d ${CTR_ENTRYPOINT_OPT_PATH}/
 
-RUN container-setup
-RUN install-pkgs ${OS_INSTALL_PKGS}
-
-RUN container-setup-php
+RUN container-setup && container-setup-php
 
 WORKDIR ${APP_DEST}
 
diff --git a/php-fpm/conf/usr/bin/container-setup-php b/php-fpm/conf/usr/bin/container-setup-php
index d6a081ad..e8d80fd3 100755
--- a/php-fpm/conf/usr/bin/container-setup-php
+++ b/php-fpm/conf/usr/bin/container-setup-php
@@ -1,6 +1,10 @@
 #!/bin/bash -e
 # description: base config for php-fpm
 
+# install pkgs
+microdnf module enable php:${PHP_VERSION}
+install-pkgs ${OS_INSTALL_PKGS}
+
 # php-fpm default config
 sed -i \
     -e 's@^error_log.*@error_log = ${PHP_FPM_ERROR_LOG}@' \
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 2dbb9a15..f1c3267d 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -1,12 +1,23 @@
 # Ansible managed
+FROM quay.io/krestomatio/base-stream AS old_pg_bin
+
+# Component bash variables
+ENV POSTGRES_PREV_VERSION="10"
+
+RUN microdnf module enable postgresql:${POSTGRES_PREV_VERSION} && \
+    install-pkgs postgresql-server && \
+    mkdir -p /opt/pg_bin && \
+    cp -rp /usr/bin/{postgres,pg_*} /opt/pg_bin/
+
+
 FROM quay.io/krestomatio/base-stream
 
 # General variables
 ENV IMAGE_NAME=postgres \
-    IMAGE_SUMMARY="Postgres 10" \
-    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs Postgres 10. \
+    IMAGE_SUMMARY="Postgres 13" \
+    IMAGE_DESCRIPTION="This CentOS 8 Stream minimal based container image runs Postgres 13. \
 It follows https://github.com/sclorg/postgresql-container" \
-    IMAGE_TITLE="Postgres 10" \
+    IMAGE_TITLE="Postgres 13" \
     IMAGE_SERVICE_PORT="5432" \
     IMAGE_SERVICE_NAME="postgres" \
     TZ="UTC"
@@ -19,9 +30,8 @@ ENV CTR_USER=postgres \
     CTR_SCRIPTS_PATH=/usr/share/container-scripts/postgresql
 
 # Component bash variables
-ENV POSTGRES_VERSION="10" \
-    POSTGRES_VER_SHORT="10" \
-    POSTGRES_PREV_VERSION="9.6" \
+ENV POSTGRES_VERSION="13" \
+    POSTGRES_PREV_VERSION="10" \
     POSTGRES_PORT=${IMAGE_SERVICE_PORT} \
     POSTGRES_RUN=/var/run/postgresql \
     POSTGRES_HOME=${CTR_HOME} \
@@ -39,10 +49,9 @@ USER 0
 COPY conf/usr /usr/
 COPY conf/container-entrypoint.d ${CTR_ENTRYPOINT_OPT_PATH}/
 
-RUN container-setup
-RUN install-pkgs ${OS_INSTALL_PKGS}
+COPY --from=old_pg_bin /opt/pg_bin/ ${HOME}/old_pg_bin_${POSTGRES_PREV_VERSION}
 
-RUN container-setup-postgres
+RUN container-setup && container-setup-postgres
 
 WORKDIR ${CTR_HOME}
 
@@ -64,4 +73,4 @@ LABEL name="${IMAGE_NAME}" \
       io.k8s.description="${IMAGE_DESCRIPTION}" \
       io.k8s.display-name="${IMAGE_TITLE}" \
       io.openshift.expose-services="${IMAGE_SERVICE_PORT}:${IMAGE_SERVICE_NAME}" \
-      io.openshift.tags="${IMAGE_NAME},postgres,postgres-${POSTGRES_VER_SHORT},postgres${POSTGRES_VER_SHORT}"
+      io.openshift.tags="${IMAGE_NAME},postgres,postgres-${POSTGRES_VERSION},postgres${POSTGRES_VERSION}"
diff --git a/postgres/conf/container-entrypoint.d/postgres.env b/postgres/conf/container-entrypoint.d/postgres.env
index a13ad216..79380a5c 100644
--- a/postgres/conf/container-entrypoint.d/postgres.env
+++ b/postgres/conf/container-entrypoint.d/postgres.env
@@ -1,10 +1,11 @@
 # description: postgres config variables
 
 export POSTGRES_REPLICATION_ROLE=${POSTGRES_REPLICATION_ROLE:-}
-export APP_DATA="${CTR_APP}"
-export CONTAINER_SCRIPTS_PATH=${CTR_SCRIPTS_PATH}
-export POSTGRESQL_VERSION=${POSTGRES_VERSION}
-export POSTGRESQL_PREV_VERSION=${POSTGRES_PREV_VERSION}
+export APP_DATA="${APP_DATA:-$CTR_APP}"
+export CONTAINER_SCRIPTS_PATH=${CONTAINER_SCRIPTS_PATH:-$CTR_SCRIPTS_PATH}
+export POSTGRESQL_VERSION=${POSTGRESQL_VERSION:-$POSTGRES_VERSION}
+export POSTGRESQL_PREV_VERSION=${POSTGRESQL_PREV_VERSION:-$POSTGRES_PREV_VERSION}
+export POSTGRESQL_UPGRADE=${POSTGRESQL_UPGRADE:-$POSTGRES_UPGRADE}
 
 if [[ ${POSTGRES_REPLICATION_ROLE,,} =~ ^(master|slave)$ ]]; then
     export ENABLE_REPLICATION=true
diff --git a/postgres/conf/usr/bin/container-setup-postgres b/postgres/conf/usr/bin/container-setup-postgres
index b34cc6ac..bb185483 100755
--- a/postgres/conf/usr/bin/container-setup-postgres
+++ b/postgres/conf/usr/bin/container-setup-postgres
@@ -1,14 +1,17 @@
 #!/bin/bash -e
 # description: base config for php-fpm
 
+# install pkgs
+microdnf module enable postgresql:${POSTGRES_VERSION}
+install-pkgs ${OS_INSTALL_PKGS}
+
 # In order to drop the root user, make some directories world
 # writeable as OpenShift default security model is to run the container under
 # random UID.
 
-mkdir -p ${POSTGRES_DATA} ${POSTGRES_APP_DATA}
+mkdir -p ${POSTGRES_DATA}
 
-fix-permissions -u ${CTR_USER_ID} ${POSTGRES_RUN} ${POSTGRES_HOME}
-fix-permissions -r -u ${CTR_USER_ID} ${POSTGRES_APP_DATA}
+fix-permissions -u ${CTR_USER_ID} ${POSTGRES_RUN} ${POSTGRES_HOME} ${POSTGRES_DATA}
 
 # restore rpm permissions
 rpm-file-permissions
diff --git a/postgres/conf/usr/libexec/check-container-postgres b/postgres/conf/usr/libexec/check-container-postgres
index 7489b435..3cae47ed 100755
--- a/postgres/conf/usr/libexec/check-container-postgres
+++ b/postgres/conf/usr/libexec/check-container-postgres
@@ -9,8 +9,6 @@
 # wait for it (this script might run forever, we expect that the timeout is
 # maintained externally).
 
-test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
-
 if test x"$1" = "x--live"; then
     # Since livenessProbe is about to detect container deadlocks, and we
     # so far don't know about real deadlocks to be detected -- we keep
@@ -26,4 +24,4 @@ pg_isready -q \
     -h 127.0.0.1 \
     ${POSTGRESQL_USER+-U "$POSTGRESQL_USER"} \
     ${POSTGRESQL_DATABASE+-d "$POSTGRESQL_DATABASE"} \
-    --timeout 0
+    --timeout ${PG_ISREADY_TIMEOUT:-3}
diff --git a/postgres/conf/usr/share/container-scripts/postgresql/common.sh b/postgres/conf/usr/share/container-scripts/postgresql/common.sh
index a64addee..8bff958f 100644
--- a/postgres/conf/usr/share/container-scripts/postgresql/common.sh
+++ b/postgres/conf/usr/share/container-scripts/postgresql/common.sh
@@ -266,14 +266,8 @@ run_pgupgrade ()
   old_raw_version=${POSTGRESQL_PREV_VERSION//\./}
   new_raw_version=${POSTGRESQL_VERSION//\./}
 
-  if test "$old_raw_version" = 92; then
-    old_collection=postgresql92
-  else
-    old_collection=rh-postgresql$old_raw_version
-  fi
-
-  old_pgengine=/opt/rh/$old_collection/root/usr/bin
-  new_pgengine=/opt/rh/rh-postgresql${new_raw_version}/root/usr/bin
+  old_pgengine=${HOME}/old_pg_bin_${POSTGRESQL_PREV_VERSION}/
+  new_pgengine=/usr/bin
   PGDATA_new="${PGDATA}-new"
 
   printf >&2 "\n==========  \$PGDATA upgrade: %s -> %s  ==========\n\n" \
@@ -285,17 +279,6 @@ run_pgupgrade ()
   # pg_upgrade writes logs to cwd, so go to the persistent storage first
   cd "$HOME"/data
 
-  # disable this because of scl_source, 'set +u' just makes the code ugly
-  # anyways
-  set +u
-
-  # we need to have the old SCL enabled, otherwise the $old_pgengine is not
-  # working.  The scl_source script doesn't pay attention to non-zero exit
-  # statuses, so use 'set +e'.
-  set +e
-  source scl_source enable $old_collection
-  set -e
-
   case $POSTGRESQL_UPGRADE in
     copy) # we accept this
       ;;