diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a6c0d22bc76a5a13c29d47489855e163a5c63d9..897d4ff7328337173ae09f3d6ace16d366b118a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: $SKA_K8S_TOOLS_DOCKER_BUILDER_IMAGE
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
+  OCI_BUILD_ADDITIONAL_TAGS: $CI_COMMIT_SHORT_SHA
 
 stages:
 - lint
@@ -52,6 +53,17 @@ before_script:
       echo "Image to build: ${IMG}"; docker pull ${IMG} || true;
     - make oci-build OCI_IMAGE=${OCI_IMAGE} CAR_OCI_REGISTRY_HOST=${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} RELEASE_CONTEXT_DIR=images/${OCI_IMAGE} OCI_BUILD_ADDITIONAL_ARGS="--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
 
+ska-tango-examples-tests:
+  variables:
+    BUILD_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-builder:$CI_COMMIT_SHORT_SHA"
+    BASE_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-runtime:$CI_COMMIT_SHORT_SHA"
+    OCI_BUILD_ADDITIONAL_ARGS: "--no-cache --build-arg BUILD_IMAGE --build-arg BASE_IMAGE "
+    SKA_PYTHON_PYTANGO_BUILDER_IMAGE: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/ska-tango-images-pytango-builder:$CI_COMMIT_SHORT_SHA"
+    PYTANGO_VERSION: "9.3.6"
+  trigger:
+    project: ska-telescope/ska-tango-examples
+    strategy: depend
+
 .tango-dependencies_rules:
   rules:
     - if: '$CI_COMMIT_TAG'
diff --git a/.make b/.make
index b41949598ba72e541035608dd96db83337290ff5..f7312752a10b8aac8938c39064121f1dbfb4f840 160000
--- a/.make
+++ b/.make
@@ -1 +1 @@
-Subproject commit b41949598ba72e541035608dd96db83337290ff5
+Subproject commit f7312752a10b8aac8938c39064121f1dbfb4f840
diff --git a/.release b/.release
index 8f85309fcc315c7b42966722a638c5c0f36c0e9a..6ebfd1a7a96fab011e4979a3545956692f4a1f65 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.3.23
-tag=0.3.23
+release=0.3.24
+tag=0.3.24
diff --git a/Makefile b/Makefile
index 71b9ef50cc11782a3aaa073da3157c540c71c86f..d8a62e4972dc126410b15afd956e66800c9f4f55 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ KUBE_NAMESPACE ?= ska-tango-images#namespace to be used
 RELEASE_NAME ?= test## release name of the chart
 K8S_CHART = ska-tango-umbrella
 MINIKUBE ?= true ## Minikube or not
-K8S_TEST_IMAGE_TO_TEST ?= artefact.skao.int/ska-tango-images-tango-itango:9.3.9 ## TODO: UGUR docker image that will be run for testing purpose
+ITANGO_VERSION ?= $(shell make show-version RELEASE_CONTEXT_DIR=images/ska-tango-images-tango-itango)
 CI_JOB_ID ?= local##pipeline job id
 TEST_RUNNER ?= test-mk-runner-$(CI_JOB_ID)##name of the pod running the k8s_tests
 TANGO_HOST ?= makefile-databaseds-also-node-port:10000## TANGO_HOST connection to the Tango DS
@@ -46,6 +46,12 @@ include .make/base.mk
 # include your own private variables for custom deployment configuration
 -include PrivateRules.mak
 
+ifneq ($(CI_REGISTRY),)
+K8S_TEST_IMAGE_TO_TEST=$(CI_REGISTRY)/ska-telescope/ska-tango-images/ska-tango-images-tango-itango:$(ITANGO_VERSION)
+else
+K8S_TEST_IMAGE_TO_TEST=artefact.skao.int/ska-tango-images-tango-itango:$(ITANGO_VERSION)
+endif
+
 oci-bump-patch-release: ## Bump patch release for all OCI Image .release files in ./images/<dir>
 	$(foreach ociimage,$(OCI_IMAGES_TO_PUBLISH), make bump-patch-release RELEASE_CONTEXT_DIR=images/$(ociimage);)
 
diff --git a/charts/ska-tango-base/Chart.yaml b/charts/ska-tango-base/Chart.yaml
index 577b3f8dc45a8c032874bc9489d2ee28af13266e..e32b7262cdb6881bd57415056136748beba64ef0 100644
--- a/charts/ska-tango-base/Chart.yaml
+++ b/charts/ska-tango-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.3.23
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-tango-base
-version: 0.3.23
+version: 0.3.24
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-util
diff --git a/charts/ska-tango-umbrella/Chart.yaml b/charts/ska-tango-umbrella/Chart.yaml
index 98348f40066cebd9a3cfd11d4d2b596dd818ca73..90db9f22c37b0c17ae17ea4d0949edb993ca1ae5 100644
--- a/charts/ska-tango-umbrella/Chart.yaml
+++ b/charts/ska-tango-umbrella/Chart.yaml
@@ -6,7 +6,7 @@ version: 0.2.5
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: ska-tango-base
-  version: 0.3.23
+  version: 0.3.24
   repository: file://../ska-tango-base
   condition: ska-tango-base.enabled,global.sub-system.ska-tango-base.enabled
 - name: ska-tango-util
diff --git a/images/ska-tango-images-pytango-builder/.release b/images/ska-tango-images-pytango-builder/.release
index 97b95782fa0ffab7594c6885d1489eefa8eb6fad..96225e0dbf18d621a1442887de0dbf46812cb1a8 100644
--- a/images/ska-tango-images-pytango-builder/.release
+++ b/images/ska-tango-images-pytango-builder/.release
@@ -1,3 +1,3 @@
-release=9.3.32
-tag=9.3.32
+release=9.3.33
+tag=9.3.33
 
diff --git a/images/ska-tango-images-pytango-builder/Dockerfile b/images/ska-tango-images-pytango-builder/Dockerfile
index 4b0aa858af6aa489f3c62a6359782d9e7807e165..ab956fc7f5c640715400dc315261c87430f13c94 100644
--- a/images/ska-tango-images-pytango-builder/Dockerfile
+++ b/images/ska-tango-images-pytango-builder/Dockerfile
@@ -58,6 +58,6 @@ RUN python3 -m pip install --no-cache-dir numpy==1.23.0
 ENV POETRY_HOME=/opt/poetry
 RUN curl -sSL https://install.python-poetry.org | python3 - --yes
 
-RUN python3 -m pip install --no-cache-dir pytango==9.3.3
+RUN python3 -m pip install --no-cache-dir pytango==9.3.6
 
 RUN ln -sfn /usr/bin/python3 /usr/bin/python && ln -sfn /opt/poetry/bin/poetry /usr/local/bin/poetry
diff --git a/images/ska-tango-images-pytango-runtime/.release b/images/ska-tango-images-pytango-runtime/.release
index 069b6b5052d521df827599efa43e26c1f82ccecf..13401b3d29248b80a89299c121a0c0eadddc414a 100644
--- a/images/ska-tango-images-pytango-runtime/.release
+++ b/images/ska-tango-images-pytango-runtime/.release
@@ -1,2 +1,2 @@
-release=9.3.19
-tag=9.3.19
+release=9.3.20
+tag=9.3.20
diff --git a/images/ska-tango-images-tango-dsconfig/.release b/images/ska-tango-images-tango-dsconfig/.release
index 3f1ffb1fde1d3888a04842b317e8f78f77519ceb..9b3d30688de80115532fad51e9aeb382ece2a452 100644
--- a/images/ska-tango-images-tango-dsconfig/.release
+++ b/images/ska-tango-images-tango-dsconfig/.release
@@ -1,2 +1,2 @@
-release=1.5.7
-tag=1.5.7
+release=1.5.8
+tag=1.5.8
diff --git a/images/ska-tango-images-tango-itango/.release b/images/ska-tango-images-tango-itango/.release
index 31adb7e2589cb095d6c86aee57ada1fc28bdade0..3253cc9b33c21276fcff189d9d491811ca998623 100644
--- a/images/ska-tango-images-tango-itango/.release
+++ b/images/ska-tango-images-tango-itango/.release
@@ -1,2 +1,2 @@
-release=9.3.10
-tag=9.3.10
+release=9.3.11
+tag=9.3.11
diff --git a/images/ska-tango-images-tango-pytango/.release b/images/ska-tango-images-tango-pytango/.release
index 27baa2de2998ca965f64f84bfe9cfd3a2d14b271..31adb7e2589cb095d6c86aee57ada1fc28bdade0 100644
--- a/images/ska-tango-images-tango-pytango/.release
+++ b/images/ska-tango-images-tango-pytango/.release
@@ -1,2 +1,2 @@
-release=9.3.9
-tag=9.3.9
+release=9.3.10
+tag=9.3.10
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 39c21bd01bc9c81f9a2bf43cab1f425687582eb9..8ffa1a3f5db24500e0796f19dd0698cbc610f11c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -7,6 +7,7 @@ pycodestyle<2.7.0,>=2.6.0a1
 pytest-bdd==5.0.0
 pytest-ordering
 pytest-timeout
+pytest-forked
 elasticsearch
 kubernetes
 assertpy