diff --git a/dockerfiles/Dockerfile.psql b/dockerfiles/Dockerfile.postgres
similarity index 100%
rename from dockerfiles/Dockerfile.psql
rename to dockerfiles/Dockerfile.postgres
diff --git a/dockerfiles/release.sh b/dockerfiles/release.sh
index 6e6c8a8d17be29254e3b1b35183b00081aee2785..edb77fb2805bb6d7ea8945de9b29f85780bb08c5 100755
--- a/dockerfiles/release.sh
+++ b/dockerfiles/release.sh
@@ -2,12 +2,13 @@
 set -e
 
 VERSION=${1:-latest}
+TYPE=${2:-staging}
 
-docker build -t gitlab.scientificnet.org:4567/commul/dspace/dspace-image:$VERSION . -f Dockerfile.dspace
-docker build -t gitlab.scientificnet.org:4567/commul/dspace/nginx-image:$VERSION . -f Dockerfile.nginx
-docker build -t gitlab.scientificnet.org:4567/commul/dspace/postgres-image:$VERSION . -f Dockerfile.psql
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/dspace:$VERSION . -f Dockerfile.dspace
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/nginx:$VERSION . -f Dockerfile.nginx
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/postgres:$VERSION . -f Dockerfile.postgres
 
-docker push gitlab.scientificnet.org:4567/commul/dspace/dspace-image:$VERSION
-docker push gitlab.scientificnet.org:4567/commul/dspace/nginx-image:$VERSION
-docker push gitlab.scientificnet.org:4567/commul/dspace/postgres-image:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/dspace:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/nginx:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/postgres:$VERSION