diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04d0e8c4fb8a0ccbf4e6cdd06052e77d2be94e04..a5368e15c7f5634db0f8a84ce8ff2d2cf5b7ef77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 # GitLab CI in conjunction with GitLab Runner can use Docker Engine to test and build any application.
 # Docker, when used with GitLab CI, runs each job in a separate and isolated container using the predefined image that is set up in .gitlab-ci.yml.
 # In this case we use the latest python docker image to build and test this project.
-image: ska-registry.av.it.pt/ska-docker/tango-builder:latest
+image: nexus.engageska-portugal.pt/ska-docker/tango-builder:latest
 
 variables:
   DOCKER_DRIVER: overlay2
@@ -17,8 +17,8 @@ cache:
 # before_script is used to define the command that should be run before all jobs, including deploy jobs, but after the restoration of artifacts.
 # This can be an array or a multi-line string.
 before_script:
-  - docker login -u $DOCKER_REGISTRY_USER_LOGIN -p $CI_REGISTRY_PASS_LOGIN $CI_REGISTRY
-
+  - docker login -u $DOCKER_REGISTRY_USER_LOGIN -p $CI_REGISTRY_PASS_LOGIN $CI_NX_REGISTRY
+  - pip install twine
 
 # The YAML file defines a set of jobs with constraints stating when they should be run.
 # You can specify an unlimited number of jobs which are defined as top-level elements with an arbitrary name and always have to contain at least the script clause.
@@ -28,17 +28,20 @@ before_script:
 stages:
   - pages
 
-
 pages:
   tags:
     - docker-executor
   stage: pages
+  variables:
+    TWINE_USERNAME: $TWINE_USERNAME
+    TWINE_PASSWORD: $TWINE_PASSWORD
   script:
     - make test
     - ls -la
     - mv build public
     - mv public/lmcbaseclasses_htmlcov/* public
     - make push
+    - twine upload --repository-url $PYPI_REPOSITORY_URL dist_test/*
   artifacts:
     paths:
       - public
diff --git a/Dockerfile b/Dockerfile
index 3ca716320b8e3bee696a665ebc78724e8183a197..781de54a96c433fc4a49e6398a4f14493c2066ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Use SKA python image as base image
-FROM ska-registry.av.it.pt/ska-docker/ska-python-buildenv:latest AS buildenv
-FROM ska-registry.av.it.pt/ska-docker/ska-python-runtime:latest AS runtime
+FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:latest AS buildenv
+FROM nexus.engageska-portugal.pt/ska-docker/ska-python-runtime:latest AS runtime
 
 # create ipython profile to so that itango doesn't fail if ipython hasn't run yet
 RUN ipython profile create
diff --git a/Makefile b/Makefile
index 33507abda40bcb8c4eb8a90a1722f2ddf4be78c5..33970baea1bc417136923bccd7255f5e92df0b06 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@
 #
 # DOCKER_REGISTRY_HOST, DOCKER_REGISTRY_USER and PROJECT are combined to define
 # the Docker tag for this project. The definition below inherits the standard
-# value for DOCKER_REGISTRY_HOST (=rska-registry.av.it.pt) and overwrites
+# value for DOCKER_REGISTRY_HOST (=rnexus.engageska-portugal.pt) and overwrites
 # DOCKER_REGISTRY_USER and PROJECT to give a final Docker tag of
-# ska-registry.av.it.pt/dishmaster/dishmaster
+# nexus.engageska-portugal.pt/dishmaster/dishmaster
 #
 DOCKER_REGISTRY_USER:=tango-example
 PROJECT = lmcbaseclasses
diff --git a/dist_test/txredisapi-1.4.4.tar.gz b/dist_test/txredisapi-1.4.4.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4f271c27f83dec45121f6078e1772b368b873fa4
Binary files /dev/null and b/dist_test/txredisapi-1.4.4.tar.gz differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 567be160c336c81a63a616186eb6c65a37544a2d..1ced40bc1fa86d64f7834277b2cc62b9e101111f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ volumes:
 
 services:
   tangodb:
-    image: ska-registry.av.it.pt/ska-docker/tango-db:latest
+    image: nexus.engageska-portugal.pt/ska-docker/tango-db:latest
     depends_on:
       - rsyslog-lmcbaseclasses
     environment:
@@ -30,7 +30,7 @@ services:
       - tangodb:/var/lib/mysql
 
   databaseds:
-    image: ska-registry.av.it.pt/ska-docker/tango-cpp:latest
+    image: nexus.engageska-portugal.pt/ska-docker/tango-cpp:latest
     depends_on:
       - tangodb
     environment: