diff --git a/.github/workflows/deploy-cvmfs.yml b/.github/workflows/deploy-cvmfs.yml
deleted file mode 100644
index 8b2d36c..0000000
--- a/.github/workflows/deploy-cvmfs.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# This workflow deploys globalDefaults.cfg to /cvmfs/dirac.egi.eu
-
-name: Deploy globalDefaults
-
-on:
-  push:
-  schedule:
-    - cron:  '0 0 * * 0'
-
-jobs:
-  dirac-deploy:
-    runs-on: ubuntu-latest
-    if: github.repository == 'DIRACGrid/management'
-    container: ghcr.io/diracgrid/management/dirac-cvmfs:latest
-    steps:
-      - name: Deploy globalDefaults.cfg
-        run: |
-          mkdir -p /root/.globus/
-          echo "${{ secrets.DIRACGRI_USERCERT }}" | tr -d '\r' > /root/.globus/usercert.pem
-          echo "${{ secrets.DIRACGRI_USERKEY }}" | tr -d '\r' > /root/.globus/userkey.pem
-          chmod 400 /root/.globus/userkey.pem
-          chmod 644  /root/.globus/usercert.pem
-          echo ${{ secrets.DIRACGRI_CERT_PASS }} | voms-proxy-init2 -cert /root/.globus/usercert.pem -key /root/.globus/userkey.pem -pwstdin
-          gsissh -p 1975 -t cvmfs-upload01.gridpp.rl.ac.uk "cd /home/diracsgm/cvmfs_repo/admin; curl -O https://raw.githubusercontent.com/DIRACGrid/management/master/globalDefaults.cfg"
-          gsissh -p 1975 -t cvmfs-upload01.gridpp.rl.ac.uk "cd /home/diracsgm/cvmfs_repo/admin; curl -O https://raw.githubusercontent.com/DIRACGrid/management/master/dirac-install.py; chmod a+x dirac-install.py"
diff --git a/.github/workflows/images-creator.yml b/.github/workflows/images-creator.yml
index 27fd796..2506f26 100644
--- a/.github/workflows/images-creator.yml
+++ b/.github/workflows/images-creator.yml
@@ -14,65 +14,13 @@ on: push
 #     - cron:  '0 0 * * 0'
 
 jobs:
-  # Image for running dirac-distribution
-  dirac-distribution:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
-        run: |
-          echo $PWD
-          ls -l
-          docker build -t dirac-distribution dirac-distribution/
-      - name: tag
-        run: |
-          docker tag dirac-distribution diracgrid/dirac-distribution:latest
-          docker tag dirac-distribution ghcr.io/diracgrid/management/dirac-distribution:latest
-      - name: show
-        run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
-        run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/dirac-distribution:latest;
-            docker push ghcr.io/diracgrid/management/dirac-distribution:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
 
-  # Now the images for running integration tests
-  docker-compose-dirac:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
-        run: docker build -t docker-compose-dirac docker-compose-dirac/
-      - name: tag
-        run: |
-          docker tag docker-compose-dirac diracgrid/docker-compose-dirac:latest
-          docker tag docker-compose-dirac ghcr.io/diracgrid/management/docker-compose-dirac:latest
-      - name: show
-        run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
-        run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/docker-compose-dirac:latest;
-            docker push ghcr.io/diracgrid/management/docker-compose-dirac:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
+  # Images for running integration tests
 
   el9-dirac:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: build
         run: docker build -t el9-dirac el9-dirac/
       - name: tag
@@ -81,48 +29,29 @@ jobs:
           docker tag el9-dirac ghcr.io/diracgrid/management/el9-dirac:latest
       - name: show
         run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
-        run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/el9-dirac:latest;
-            docker push ghcr.io/diracgrid/management/el9-dirac:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
 
-  c8-dirac:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
-        run: docker build -t c8-dirac c8-dirac/
-      - name: tag
-        run: |
-          docker tag c8-dirac diracgrid/c8-dirac:latest
-          docker tag c8-dirac ghcr.io/diracgrid/management/c8-dirac:latest
-      - name: show
-        run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: push
         run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/c8-dirac:latest;
-            docker push ghcr.io/diracgrid/management/c8-dirac:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
+          docker push diracgrid/el9-dirac:latest;
+          docker push ghcr.io/diracgrid/management/el9-dirac:latest;
 
   cc7-dirac:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: build
         run: docker build -t cc7-dirac cc7-dirac/
       - name: tag
@@ -131,73 +60,21 @@ jobs:
           docker tag cc7-dirac ghcr.io/diracgrid/management/cc7-dirac:latest
       - name: show
         run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
-        run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/cc7-dirac:latest;
-            docker push ghcr.io/diracgrid/management/cc7-dirac:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
 
-  # Image for deploying config files to CVMFS (GridFTP)
-  dirac-cvmfs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
-        run: |
-          echo $PWD
-          ls -l
-          docker build -t dirac-cvmfs dirac-cvmfs/
-      - name: tag
-        run: |
-          docker tag dirac-cvmfs diracgrid/dirac-cvmfs:latest
-          docker tag dirac-cvmfs ghcr.io/diracgrid/management/dirac-cvmfs:latest
-      - name: show
-        run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
-        run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/dirac-cvmfs:latest;
-            docker push ghcr.io/diracgrid/management/dirac-cvmfs:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-  # Image for building DIRAOS
-  centos6:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
-        run: |
-          echo $PWD
-          ls -l
-          docker build -t centos6 centos6/
-      - name: tag
-        run: |
-          docker tag centos6 diracgrid/centos6:latest
-          docker tag centos6 ghcr.io/diracgrid/management/centos6:latest
-      - name: show
-        run: docker images
-      - name: login and push
-        env:
-          deploy_secret: ${{ secrets.DOCKER_HUB_USERNAME }}
+      - name: push
         run: |
-          if [ ! -z ${deploy_secret} ]; then
-            echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin;
-            echo ${{ secrets.CR_PAT }} | docker login ghcr.io --username ${{ github.actor }} --password-stdin;
-            docker push diracgrid/centos6:latest;
-            docker push ghcr.io/diracgrid/management/centos6:latest;
-          else
-            echo "Skipping deploy no secrets present";
-          fi
+          docker push diracgrid/cc7-dirac:latest;
+          docker push ghcr.io/diracgrid/management/cc7-dirac:latest;
diff --git a/c8-dirac/Dockerfile b/c8-dirac/Dockerfile
deleted file mode 100644
index 0651bbc..0000000
--- a/c8-dirac/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#   Simple extension of CC7 with git, openssl and runit
-#
-#..................................................................
-FROM cern/c8-base:latest
-ARG RUNIT_RPM=runit-2.1.2-1.el7.cern.x86_64.rpm
-
-RUN yum install -y git freetype fontconfig pixman libXrender psmisc python2 python3 && \
-    yum localinstall -y "http://diracproject.web.cern.ch/diracproject/rpm/${RUNIT_RPM}" && \
-    yum clean all && \
-    rm -rf /var/lib/apt/lists/* /lib/modules/* /lib/firmware/* /lib/kbd /var/cache/yum
-
-CMD ["/usr/sbin/init"]
diff --git a/centos6/CentOS-Vault.repo b/centos6/CentOS-Vault.repo
deleted file mode 100644
index 40e87fc..0000000
--- a/centos6/CentOS-Vault.repo
+++ /dev/null
@@ -1,41 +0,0 @@
-# CentOS-Vault.repo
-#
-# CentOS Vault holds packages from previous releases within the same CentOS Version
-# these are packages obsoleted by the current release and should usually not 
-# be used in production
-#-----------------
-
-[C6.10-base]
-name=CentOS-6.10 - Base
-baseurl=http://vault.centos.org/6.10/os/$basearch/
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-[C6.10-updates]
-name=CentOS-6.10 - Updates
-baseurl=http://vault.centos.org/6.10/updates/$basearch/
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-[C6.10-extras]
-name=CentOS-6.10 - Extras
-baseurl=http://vault.centos.org/6.10/extras/$basearch/
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-[C6.10-contrib]
-name=CentOS-6.10 - Contrib
-baseurl=http://vault.centos.org/6.10/contrib/$basearch/
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
-
-[C6.10-centosplus]
-name=CentOS-6.10 - CentOSPlus
-baseurl=http://vault.centos.org/6.10/centosplus/$basearch/
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-enabled=1
diff --git a/centos6/Dockerfile b/centos6/Dockerfile
deleted file mode 100644
index bc8c99c..0000000
--- a/centos6/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM centos:6
-LABEL maintainer="marko.petric@cern.ch"
-ENV container docker
-
-# Remove obsolete repos
-RUN rm -rf /etc/yum.repos.d/*
-
-# Install enabled Vault Repo
-COPY CentOS-Vault.repo /etc/yum.repos.d/CentOS-Vault.repo
-
-# Install disabled Springdale repo
-COPY PU_IAS6.repo /etc/yum.repos.d/PU_IAS6.repo
-
-# Install EPEL 
-COPY epel.repo /etc/yum.repos.d/epel.repo
-
-# Install DIRACOS requirements
-RUN yum install -y mock rpm-build fedora-packager createrepo python-pip
-
-# Run bash as user default command
-CMD ["/bin/bash"]
diff --git a/centos6/PU_IAS6.repo b/centos6/PU_IAS6.repo
deleted file mode 100644
index 6b112ad..0000000
--- a/centos6/PU_IAS6.repo
+++ /dev/null
@@ -1,23 +0,0 @@
-[PUIAS_6_core_Base]
-name=PUIAS core Base $releasever - $basearch
-mirrorlist=http://puias.math.ias.edu/data/puias/$releasever/$basearch/os/mirrorlist
-#baseurl=http://puias.math.ias.edu/data/puias/$releasever/$basearch/os
-enable=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puias
-
-[PUIAS_6_core_Updates]
-name=PUIAS core Updates $releasever - $basearch
-mirrorlist=http://puias.math.ias.edu/data/puias/updates/$releasever/en/os/$basearch/mirrorlist
-#baseurl=http://puias.math.ias.edu/data/puias/updates/$releasever/en/os/$basearch
-enable=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puias
-
-[PUIAS_6_computational]
-name=PUIAS computational Base $releasever - $basearch
-mirrorlist=http://puias.math.ias.edu/data/puias/computational/$releasever/$basearch/mirrorlist
-#baseurl=http://puias.math.ias.edu/data/puias/computational/$releasever/$basearch
-enable=0
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puias
diff --git a/centos6/epel.repo b/centos6/epel.repo
deleted file mode 100644
index 6e63e6c..0000000
--- a/centos6/epel.repo
+++ /dev/null
@@ -1,25 +0,0 @@
-[epel]
-name=Extra Packages for Enterprise Linux 6 - $basearch
-baseurl=http://archives.fedoraproject.org/pub/archive/epel/6/$basearch
-failovermethod=priority
-enabled=1
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
-
-[epel-debuginfo]
-name=Extra Packages for Enterprise Linux 6 - $basearch - Debug
-#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
-gpgcheck=1
-
-[epel-source]
-name=Extra Packages for Enterprise Linux 6 - $basearch - Source
-#baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
-gpgcheck=1
diff --git a/dirac-cvmfs/Dockerfile b/dirac-cvmfs/Dockerfile
deleted file mode 100644
index f7dae1c..0000000
--- a/dirac-cvmfs/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#   Simple extension of CC7 with GridFTP and gsissh
-#
-#..................................................................
-FROM cern/cc7-base:latest
-
-# Add the EGI trustanchors and CAs
-ADD http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo /etc/yum.repos.d/EGI-trustanchors.repo
-RUN yum install -y ca-policy-egi-core
-
-RUN yum install -y globus-ftp-client gsissh gsi-openssh-clients voms-clients
diff --git a/slc6-dirac/Dockerfile b/slc6-dirac/Dockerfile
deleted file mode 100644
index 31fd6c8..0000000
--- a/slc6-dirac/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#   Simple extension of slc6 with git, openssl and runit
-#
-#..................................................................
-FROM cern/slc6-base:latest
-ARG RUNIT_RPM=runit-2.1.2-1.el6.x86_64.rpm
-
-RUN yum install -y git tar openssl freetype fontconfig pixman libXrender htop psmisc && \
-    yum localinstall -y "http://diracproject.web.cern.ch/diracproject/rpm/${RUNIT_RPM}" && \
-    rm /etc/init/runsvdir.conf && \
-    yum clean all && \
-    rm -rf /var/lib/apt/lists/* /lib/modules/* /lib/firmware/* /lib/kbd /var/cache/yum
-
-CMD ["/sbin/init"]