diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96c837854c463aff0dbb48cfd7e0270da385455e..03c168d61e5542f4ecb2e10543753da1a4fe02f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ stages:
 - build_4
 - build_5
 - test
+- push
 
 # https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#authenticating-to-the-container-registry
 before_script:
@@ -26,11 +27,10 @@ build_tango-builder:
   retry: 2
   stage: build_0
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-builder
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-builder/**/*
@@ -39,11 +39,10 @@ build_dependencies:
   retry: 2
   stage: build_1
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-dependencies
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -52,11 +51,10 @@ build_tango-db:
   retry: 2
   stage: build_1
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-db
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-db/**/*
@@ -65,11 +63,10 @@ build_tango-cpp:
   retry: 2
   stage: build_2
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-cpp
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -79,11 +76,10 @@ build_tango-java:
   retry: 2
   stage: build_2
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-java
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -93,11 +89,10 @@ build_tango-dsconfig:
   retry: 2
   stage: build_3
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-dsconfig
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -108,11 +103,10 @@ build_ska-python-buildenv:
   retry: 2
   stage: build_3
   tags:
-    - docker-executor
+    - shell
   script:
     - cd docker/tango/ska-python-buildenv
-    - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-    - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+    - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
       - docker/tango/tango-dependencies/**/*
@@ -123,11 +117,10 @@ build_ska-python-runtime:
   retry: 2
   stage: build_4
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/ska-python-runtime
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -139,11 +132,10 @@ build_tango-rest:
   retry: 2
   stage: build_3
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-rest
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -154,11 +146,10 @@ build_tango-itango:
   retry: 2
   stage: build_5
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-itango
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -171,11 +162,10 @@ build_tango-pogo:
   retry: 2
   stage: build_3
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-pogo
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -186,11 +176,10 @@ build_tango-starter:
   retry: 2
   stage: build_3
   tags:
-  - docker-executor
+  - shell
   script:
   - cd docker/tango/tango-starter
-  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - make DOCKER_BUILD_ARGS="--no-cache" DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST build
   only:
     changes:
     - docker/tango/tango-dependencies/**/*
@@ -201,54 +190,70 @@ test-framework-tango-itango:
   retry: 2
   stage: test
   tags:
-  - docker-executor
+  - shell
   script:
   - mkdir .public
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango pull > .public/pull.txt
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango test > .public/result.txt
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango pull | tee .public/pull.txt
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-itango test | tee .public/result.txt
   - mv .public public
   artifacts:
     paths:
     - public
-  # only:
-    # changes:
-    # - docker/tango/tango-dependencies/**/*
-    # - docker/tango/tango-cpp/**/*
-    # - docker/tango/tango-python/**/*
-    # - docker/tango/tango-itango/**/*
 
 test-framework-tango-rest:
   retry: 2
   stage: test
   tags:
-  - docker-executor
+  - shell
   script:
   - mkdir .public
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-rest test > .public/result.txt
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/tango-rest test | tee .public/result.txt
   - mv .public public
   artifacts:
     paths:
     - public
-  # only:
-    # changes:
-    # - docker/tango/tango-dependencies/**/*
-    # - docker/tango/tango-cpp/**/*
-    # - docker/tango/tango-rest/**/*
+  allow_failure: true
 
 test-framework-ska-python-buildenv:
   retry: 2
   stage: test
   tags:
-  - docker-executor
+  - shell
   script:
   - mkdir .public
-  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_FOLDER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/ska-python-buildenv test > .public/result.txt
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST -C docker/tango/ska-python-buildenv test | tee .public/result.txt
   - mv .public public
   artifacts:
     paths:
     - public
-  # only:
-    # changes:
-    # - docker/tango/tango-dependencies/**/*
-    # - docker/tango/tango-cpp/**/*
-    # - docker/tango/ska-python-buildenv/**/*
+
+push: 
+  stage: push
+  tags:
+  - shell
+  script: 
+  - cd docker/tango/tango-builder
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-dependencies
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-db
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-cpp
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-java
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-dsconfig
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/ska-python-buildenv
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/ska-python-runtime
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-rest
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-itango
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-pogo
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  - cd ../../../docker/tango/tango-starter
+  - make DOCKER_REGISTRY_USER=$DOCKER_REGISTRY_USER DOCKER_REGISTRY_HOST=$DOCKER_REGISTRY_HOST push
+  when: manual
\ No newline at end of file
diff --git a/docker/tango/ska-python-buildenv/.release b/docker/tango/ska-python-buildenv/.release
index d9678113ea4d74e2c87236db3a28b8fbe251ef2f..7b1afb5497c66ece7eadfa3a69380c7e74c2f6ad 100644
--- a/docker/tango/ska-python-buildenv/.release
+++ b/docker/tango/ska-python-buildenv/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=ska-python-buildenv-0.1.0
+release=0.2.0
+tag=ska-python-buildenv-0.2.0
diff --git a/docker/tango/ska-python-buildenv/Dockerfile b/docker/tango/ska-python-buildenv/Dockerfile
index 2cc5166fcbde6bd692fe2926625795bc12f30eec..ad70dd4c34e09a37d101d8122f577ed4c0f956bd 100644
--- a/docker/tango/ska-python-buildenv/Dockerfile
+++ b/docker/tango/ska-python-buildenv/Dockerfile
@@ -65,7 +65,11 @@ COPY --chown=tango:tango Pipfile Pipfile
 COPY --chown=tango:tango Pipfile.lock Pipfile.lock
 
 # Install PyTango et al. into the virtual environment.
-RUN pipenv install --dev
+# for Debian buster - make sure the correct libboost_python named lib is present
+RUN if [ -f "/usr/lib/x86_64-linux-gnu/libboost_python3-py37.so" ] && [ ! -f "/usr/lib/x86_64-linux-gnu/libboost_python-py37.so" ]; then \
+    ln -s /usr/lib/x86_64-linux-gnu/libboost_python3-py37.so /usr/lib/x86_64-linux-gnu/libboost_python-py37.so; \
+    fi; \
+    pipenv install --dev
 
 # The following commands are executed when extending this image.
 # Copy the Pipfile across to the image so that pipenv knows which dependencies
diff --git a/docker/tango/ska-python-buildenv/Pipfile b/docker/tango/ska-python-buildenv/Pipfile
index 815b56081f72cfa2948d62b6d677f8b81002f950..23d9d6aa9a6b8e592b81809ddf964c72356d9657 100644
--- a/docker/tango/ska-python-buildenv/Pipfile
+++ b/docker/tango/ska-python-buildenv/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 numpy = "==1.15.4"
-pytango = "==9.2.5"
+pytango = "==9.3.1"
 
 [dev-packages]
 docutils = "*"
diff --git a/docker/tango/ska-python-runtime/.release b/docker/tango/ska-python-runtime/.release
index 05e02ff008467bb8db9f37c8b3c6351778203ebf..86df8fb7d00ef1e7cd2010f2a7e79ffb564b82b5 100644
--- a/docker/tango/ska-python-runtime/.release
+++ b/docker/tango/ska-python-runtime/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=ska-python-runtime-0.1.0
+release=0.2.0
+tag=ska-python-runtime-0.2.0
diff --git a/docker/tango/ska-python-runtime/Dockerfile b/docker/tango/ska-python-runtime/Dockerfile
index ad7064e59c82a87fb75a0a17013b90a5c9a67306..7aff38d195d38d9dfa8390367f7a01ed61419a20 100644
--- a/docker/tango/ska-python-runtime/Dockerfile
+++ b/docker/tango/ska-python-runtime/Dockerfile
@@ -21,7 +21,7 @@ USER root
 # * python3 is required as this image is intended for running Python Tango
 #   devices.
 #
-RUN runtimeDeps='libboost-python1.62.0 \
+RUN runtimeDeps='libboost-python1.67.0 \
                  make \
                  python3' \
     && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
diff --git a/docker/tango/ska-python-runtime/Pipfile b/docker/tango/ska-python-runtime/Pipfile
index 815b56081f72cfa2948d62b6d677f8b81002f950..23d9d6aa9a6b8e592b81809ddf964c72356d9657 100644
--- a/docker/tango/ska-python-runtime/Pipfile
+++ b/docker/tango/ska-python-runtime/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 numpy = "==1.15.4"
-pytango = "==9.2.5"
+pytango = "==9.3.1"
 
 [dev-packages]
 docutils = "*"
diff --git a/docker/tango/tango-cpp/.release b/docker/tango/tango-cpp/.release
index 2632e5e9cae2d4d73dbd466928800f8f83de88fa..ce642e9df087c1c20150d390f200ac4a828df262 100644
--- a/docker/tango/tango-cpp/.release
+++ b/docker/tango/tango-cpp/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-cpp-0.1.0
+release=0.2.0
+tag=tango-cpp-0.2.0
diff --git a/docker/tango/tango-cpp/Dockerfile b/docker/tango/tango-cpp/Dockerfile
index e69a1979ccb1bbcacafc97f9bbc7c8d7bcab0ba8..a8705b517a7f2b0807413df273516a6ad98dcb8d 100644
--- a/docker/tango/tango-cpp/Dockerfile
+++ b/docker/tango/tango-cpp/Dockerfile
@@ -7,8 +7,7 @@ ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
 FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv
 
-RUN TANGO_VERSION=9.2.5a \
-    && TANGO_DOWNLOAD_URL=https://netcologne.dl.sourceforge.net/project/tango-cs/tango-$TANGO_VERSION.tar.gz \
+RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz \
     # Speed up image builds by adding apt proxy if detected on host
     && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
     && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
@@ -28,10 +27,10 @@ RUN TANGO_VERSION=9.2.5a \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/tango
 
-FROM debian:stretch-slim
+FROM debian:buster-slim
 COPY --from=buildenv /usr/local /usr/local
 
-RUN runtimeDeps='libmariadbclient18 sudo' \
+RUN runtimeDeps='libmariadb3 sudo' \
     && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
     && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
     && echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host" \
diff --git a/docker/tango/tango-db/Dockerfile b/docker/tango/tango-db/Dockerfile
index 4ab345d84071e015d2217452dd4f05682c362236..cf86046230198b4b1b3cc61357a46713b78f799d 100644
--- a/docker/tango/tango-db/Dockerfile
+++ b/docker/tango/tango-db/Dockerfile
@@ -1,9 +1,8 @@
 FROM mariadb:10
 
-ENV TANGO_VERSION=9.2.5a
-ENV TANGO_DOWNLOAD_URL=https://netcologne.dl.sourceforge.net/project/tango-cs/tango-$TANGO_VERSION.tar.gz                                                                    
+ENV TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz                                                               
 
-RUN buildDeps='curl' \
+RUN buildDeps='curl ca-certificates' \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && apt-get -y install --no-install-recommends $buildDeps \
     && rm -rf /var/lib/apt/lists/* \
diff --git a/docker/tango/tango-dependencies/.release b/docker/tango/tango-dependencies/.release
index 7c2d2f65e8cb10e617a695ff76f9c8dfad943cb5..328b8b51d6076575d693218a52e9aaec2d9a1c23 100644
--- a/docker/tango/tango-dependencies/.release
+++ b/docker/tango/tango-dependencies/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-dependencies-0.1.0
+release=0.2.0
+tag=tango-dependencies-0.2.0
diff --git a/docker/tango/tango-dependencies/Dockerfile b/docker/tango/tango-dependencies/Dockerfile
index d183f729d9ebb93e28d1bb9dddc1da327dc81282..0acb2b7069fb8f3d502901976399ff1a83b770f3 100644
--- a/docker/tango/tango-dependencies/Dockerfile
+++ b/docker/tango/tango-dependencies/Dockerfile
@@ -3,7 +3,7 @@
 # intermediate image, then creates a release image containing the compiled
 # binaries.
 #
-FROM debian:stretch-slim as buildenv
+FROM debian:buster-slim as buildenv
 
 # Copy across files that are used to help orchestrate container compositions
 # and test execution sequences
@@ -14,40 +14,53 @@ RUN DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" subs
     && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
     && echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host"
 
-RUN ZEROMQ_VERSION=4.0.5 \
-    && ZEROMQ_DOWNLOAD_URL=https://archive.org/download/zeromq_$ZEROMQ_VERSION/zeromq-$ZEROMQ_VERSION.tar.gz \
+RUN ZEROMQ_DOWNLOAD_URL=https://github.com/zeromq/libzmq/archive/v4.3.2.tar.gz \
     && buildDeps='autoconf automake build-essential ca-certificates curl libkrb5-dev libtool pkg-config unzip' \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && apt-get -y install $buildDeps --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir /usr/src/zeromq \
     && cd /usr/src/zeromq \
-    && curl -fsSL "$ZEROMQ_DOWNLOAD_URL" -o zeromq.tar.gz \
+    && curl -kfsSL "$ZEROMQ_DOWNLOAD_URL" -o zeromq.tar.gz \
     && tar xf zeromq.tar.gz -C /usr/src/zeromq --strip-components=1 \
+    && ./autogen.sh \
     && ./configure --enable-static=no \
     && make -C /usr/src/zeromq -j$(nproc) \
     && make -C /usr/src/zeromq install \
-    && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/zeromq
 
-RUN OMNIORB_DOWNLOAD_URL=https://svwh.dl.sourceforge.net/project/omniorb/omniORB/omniORB-4.2.1/omniORB-4.2.1-2.tar.bz2 \
-    && OMNIORB_PATCH_URL=http://ftp.esrf.fr/pub/cs/tango/Patches/dii_race.patch \
+
+RUN CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz \
+    && buildDeps='autoconf automake build-essential ca-certificates curl libkrb5-dev libtool pkg-config unzip cmake' \
+    && DEBIAN_FRONTEND=noninteractive apt-get update \
+    && apt-get -y install $buildDeps --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir /usr/src/cppzmq \
+    && cd /usr/src/cppzmq \
+    && curl -kfsSL "$CPPZMQ_DOWNLOAD_URL" -o cppzmq.tar.gz \
+    && tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \
+    && mkdir build \
+    && cd build \
+    && cmake .. \
+    && make -j4 install \
+    && apt-get purge -y --auto-remove $buildDeps \
+    && rm -r /usr/src/cppzmq
+
+RUN OMNIORB_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/omniorb/omniORB-4.2.3.tar.bz2 \
     && buildDeps='build-essential ca-certificates curl python-dev python-pkgconfig' \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && apt-get -y install --no-install-recommends $buildDeps \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /usr/src/omniorb \
     && cd /usr/src/omniorb \
-    && curl -fsSL "$OMNIORB_DOWNLOAD_URL" -o omniorb.tar.bz2 \
-    && curl -fsSL "$OMNIORB_PATCH_URL" -o dii_race.patch \
+    && curl -kfsSL "$OMNIORB_DOWNLOAD_URL" -o omniorb.tar.bz2 \
     && tar xf omniorb.tar.bz2 -C /usr/src/omniorb --strip-components=1 \
-    && patch -p0 < dii_race.patch \
     && ./configure --enable-static=no \
     && make -C /usr/src/omniorb -j$(nproc) \
     && make -C /usr/src/omniorb install \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/omniorb
 
-FROM debian:stretch-slim
+FROM debian:buster-slim
 COPY --from=buildenv /usr/local /usr/local
 
diff --git a/docker/tango/tango-dsconfig/.release b/docker/tango/tango-dsconfig/.release
index 234f3139463641354fbf541cc4111157c5fae56f..1aa15cc7e7726dd0efdfa133cb773befa1ac55d4 100644
--- a/docker/tango/tango-dsconfig/.release
+++ b/docker/tango/tango-dsconfig/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-dsconfig-0.1.0
+release=0.2.0
+tag=tango-dsconfig-0.2.0
diff --git a/docker/tango/tango-dsconfig/Dockerfile b/docker/tango/tango-dsconfig/Dockerfile
index 59eee3cbe1221c2657dbe8fed471db6970cd0429..a762598be24178d32f39c6f814216fa24199f40e 100644
--- a/docker/tango/tango-dsconfig/Dockerfile
+++ b/docker/tango/tango-dsconfig/Dockerfile
@@ -16,7 +16,9 @@ RUN DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" subs
 # * pkg-config is used to locate required libraries
 # * virtualenv is required to create a new Python virtualenv environment
 #
-RUN buildDeps='build-essential \
+
+RUN ln -s /usr/lib/x86_64-linux-gnu/libboost_python27.so /usr/lib/x86_64-linux-gnu/libboost_python-py27.so; \
+    buildDeps='build-essential \
                libboost-python-dev \
                pkg-config \
                git \
diff --git a/docker/tango/tango-itango/.release b/docker/tango/tango-itango/.release
index fac3ddd1dd4e6c047fe35f7ebc10e6025bfb378c..8167358a6551827d47f5c5588a989a5661f1aae4 100644
--- a/docker/tango/tango-itango/.release
+++ b/docker/tango/tango-itango/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-itango-0.1.0
+release=0.2.0
+tag=tango-itango-0.2.0
diff --git a/docker/tango/tango-java/.release b/docker/tango/tango-java/.release
index ebfc5f80e4cfe290b5e070c5d01f685dec8f5327..cb2c9e0b2576b89a951e0d09ddf837c0c0ac4ed8 100644
--- a/docker/tango/tango-java/.release
+++ b/docker/tango/tango-java/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-java-0.1.0
+release=0.2.0
+tag=tango-java-0.2.0
diff --git a/docker/tango/tango-java/Dockerfile b/docker/tango/tango-java/Dockerfile
index 99723524aa406ffdbe89ae67616b161d7de64939..080a7eb946b3644b6923fad945243daa80875e3e 100644
--- a/docker/tango/tango-java/Dockerfile
+++ b/docker/tango/tango-java/Dockerfile
@@ -5,21 +5,32 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest
 
-RUN TANGO_VERSION=9.2.5a \
-    && TANGO_DOWNLOAD_URL=https://netcologne.dl.sourceforge.net/project/tango-cs/tango-$TANGO_VERSION.tar.gz \
+RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jre-8u221-linux-x64.tar.gz \
+    && mkdir /usr/java \
+    && cd /usr/java \
+    && buildDeps='wget sudo libxrender1 libxtst6 libxi6' \
+    && DEBIAN_FRONTEND=noninteractive apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends $buildDeps \
+    && wget --no-check-certificate "$JAVA_DOWNLOAD_URL" -O java.tar.gz \
+    && tar zxvf java.tar.gz \
+    && update-alternatives --install /usr/bin/java java /usr/java/jre1.8.0_221/bin/java 0 \
+    && update-alternatives --set java /usr/java/jre1.8.0_221/bin/java \
+    && rm /usr/java/java.tar.gz
+
+RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.3-rc2.tar.gz \
     && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
     && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
     && echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host" \
     && mkdir -p /usr/share/man/man1 \
-    && buildDeps='build-essential curl file libmariadbclient-dev libmariadbclient-dev-compat default-jdk pkg-config python' \
+    && buildDeps='build-essential curl file libmariadbclient-dev libmariadbclient-dev-compat pkg-config python libmariadb3' \
     && DEBIAN_FRONTEND=noninteractive apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends $buildDeps \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /usr/src/tango \
     && cd /usr/src/tango \
-    && curl -fsSL "$TANGO_DOWNLOAD_URL" -o tango.tar.gz \
+    && curl -fsSL -k "$TANGO_DOWNLOAD_URL" -o tango.tar.gz \
     && tar xf tango.tar.gz -C /usr/src/tango --strip-components=1 \
     && ./configure --with-zmq=/usr/local --with-omni=/usr/local --with-mysqlclient-prefix=/usr --enable-static=no \
     && make -C /usr/src/tango -j$(nproc) \
@@ -28,19 +39,13 @@ RUN TANGO_VERSION=9.2.5a \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/tango
 
-FROM debian:stretch-slim
-COPY --from=buildenv /usr/local /usr/local
-
-RUN runtimeDeps='default-jre-headless libmariadbclient18 sudo' \
-    && mkdir -p /usr/share/man/man1 \
-    && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
-    && /usr/local/bin/wait-for-it.sh --host=$DOCKERHOST --port=3142 --timeout=3 --strict --quiet -- echo "Acquire::http::Proxy \"http://$DOCKERHOST:3142\";" > /etc/apt/apt.conf.d/30proxy \
-    && echo "Proxy detected on docker host - using for this build" || echo "No proxy detected on docker host" \
-    && DEBIAN_FRONTEND=noninteractive apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends $runtimeDeps \
-    && rm -rf /var/lib/apt/lists/* /etc/apt/apt.conf.d/30proxy
-
-RUN sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibility.properties
+RUN LOG4J=https://nexus.engageska-portugal.pt/repository/raw/java/log4j-1.2.17.tar.gz \
+    && cd /usr/java \
+    && wget --no-check-certificate "$LOG4J" -O log4j.tar.gz \
+    && tar zxvf log4j.tar.gz \
+    && mv apache-log4j-1.2.17/log4j-1.2.17.jar /usr/local/share/java/log4j-1.2.17.jar \
+    && apt-get purge -y --auto-remove wget \
+    && rm /usr/java/log4j.tar.gz
 
 RUN useradd --create-home --home-dir /home/tango tango
 
diff --git a/docker/tango/tango-pogo/.release b/docker/tango/tango-pogo/.release
index 49dbcc5156d579ddd846029b3cf5e85a252560ec..37a4b279e0e1c9668e709d1d319960179ef550d8 100644
--- a/docker/tango/tango-pogo/.release
+++ b/docker/tango/tango-pogo/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-pogo-0.1.0
+release=0.2.0
+tag=tango-pogo-0.2.0
diff --git a/docker/tango/tango-rest/.release b/docker/tango/tango-rest/.release
index 96b520871b46e4b1efed4f4685645fdee34ca139..5bcf88196e9da24129d1d768fb9d6e2d83d5c26f 100644
--- a/docker/tango/tango-rest/.release
+++ b/docker/tango/tango-rest/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-rest-0.1.0
+release=0.2.0
+tag=tango-rest-0.2.0
diff --git a/docker/tango/tango-rest/Dockerfile b/docker/tango/tango-rest/Dockerfile
index 88de949a32aab44af2c244c888f6356252585193..45dd8d59499d2272a1429013b3595f83fb5d7ced 100644
--- a/docker/tango/tango-rest/Dockerfile
+++ b/docker/tango/tango-rest/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_HOST
 ARG DOCKER_REGISTRY_USER
-FROM debian:stretch-slim as buildenv
+FROM debian:buster-slim as buildenv
 
 RUN MTANGOREST_VERSION=rc4-2.12 \
     && MTANGOREST_DOWNLOAD_URL=https://github.com/Ingvord/mtangorest.server/releases/download/mtangorest.server-$MTANGOREST_VERSION/mtangorest.server-$MTANGOREST_VERSION.jar \
diff --git a/docker/tango/tango-rest/Makefile b/docker/tango/tango-rest/Makefile
index b3d2fb0b3365c9f1376592d995bf78e18197327b..15911887c7c0272ebd60e7c82b4ae07a92065bad 100644
--- a/docker/tango/tango-rest/Makefile
+++ b/docker/tango/tango-rest/Makefile
@@ -7,7 +7,7 @@ CACHE_VOLUME = tango-rest-test-cache
 DOCKER_RUN_ARGS =
 
 # defines the image to test
-IMAGE_TO_TEST = $(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/tango-rest:latest
+IMAGE_TO_TEST = $(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/tango-itango:latest
 
 # docker-compose commmand for a composition of services for the tango database,
 # databaseds device, and tangotest devices
diff --git a/docker/tango/tango-starter/.release b/docker/tango/tango-starter/.release
index 84258575659c7d6ada004df326c096a713e746c9..a718fbf678ef4674694112899e9a40ef2895d50b 100644
--- a/docker/tango/tango-starter/.release
+++ b/docker/tango/tango-starter/.release
@@ -1,2 +1,2 @@
-release=0.1.0
-tag=tango-starter-0.1.0
+release=0.2.0
+tag=tango-starter-0.2.0