diff --git a/.docker-registry/auth/htpasswd b/.docker-registry/auth/htpasswd
deleted file mode 100644
index 737dedc9becc6546a51f3d890a1c6b682ac0f3a4..0000000000000000000000000000000000000000
--- a/.docker-registry/auth/htpasswd
+++ /dev/null
@@ -1,2 +0,0 @@
-mweise:$2y$05$eC9011766P4kKvgUYeZ1d.4AISb6IEge3zEFbrZGXXUa8BKIfUPra
-
diff --git a/.docker-registry/create b/.docker-registry/create
deleted file mode 100755
index a076148774868034107f23f94fbc1912a13f97b7..0000000000000000000000000000000000000000
--- a/.docker-registry/create
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-if [ $# -ne 2 ]; then
-  echo "USAGE: ./create username password"
-  exit 1
-fi
-
-docker run \
-  --entrypoint htpasswd \
-  httpd:2 -Bbn $1 $2 > auth/htpasswd
\ No newline at end of file
diff --git a/.docker-registry/run b/.docker-registry/run
deleted file mode 100755
index 0bfa4739648d945d4a45d7238adee4eab4f6ebca..0000000000000000000000000000000000000000
--- a/.docker-registry/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-docker run -d \
-  -p 5000:5000 \
-  --restart=always \
-  --name registry \
-  -v "$(pwd)"/auth:/auth \
-  -e "REGISTRY_AUTH=htpasswd" \
-  -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-  -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-  -v "$(pwd)"/certs:/certs \
-  registry:2
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46dfa8e4caf70b29534ea11b00548a423a54ba76..15f1f71393d532d1c931628d2667ae75b7632348 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,28 +164,32 @@ test-backend-citation:
 
 deploy-images:
   stage: deploy
+  only:
+    - tags
   rules:
     - if: '$CI_COMMIT_REF_NAME == "master"'
-    - when: manual
   script:
-    - docker tag fda-metadata-db dbrepo.ossdip.at/fda-metadata-db:latest
-    - docker tag fda-analyse-service dbrepo.ossdip.at/fda-analyse-service:latest
-    - docker tag fda-broker-service dbrepo.ossdip.at/fda-broker-service:latest
-    - docker tag fda-citation-service dbrepo.ossdip.at/fda-citation-service:latest
-    - docker tag fda-container-service dbrepo.ossdip.at/fda-container-service:latest
-    - docker tag fda-database-service dbrepo.ossdip.at/fda-database-service:latest
-    - docker tag fda-discovery-service dbrepo.ossdip.at/fda-discovery-service:latest
-    - docker tag fda-gateway-service dbrepo.ossdip.at/fda-gateway-service:latest
-    - docker tag fda-query-service dbrepo.ossdip.at/fda-query-service:latest
-    - docker tag fda-table-service dbrepo.ossdip.at/fda-table-service:latest
-    - docker tag fda-ui dbrepo.ossdip.at/fda-ui:latest
-    - docker push dbrepo.ossdip.at/fda-metadata-db:latest
-    - docker push dbrepo.ossdip.at/fda-analyse-service:latest
-    - docker push dbrepo.ossdip.at/fda-broker-service:latest
-    - docker push dbrepo.ossdip.at/fda-citation-service:latest
-    - docker push dbrepo.ossdip.at/fda-container-service:latest
-    - docker push dbrepo.ossdip.at/fda-discovery-service:latest
-    - docker push dbrepo.ossdip.at/fda-database-service:latest
-    - docker push dbrepo.ossdip.at/fda-gateway-service:latest
-    - docker push dbrepo.ossdip.at/fda-query-service:latest
-    - docker push dbrepo.ossdip.at/fda-table-service:latest
+    - "VERSION=$(echo $CI_COMMIT_TAG | grep -o '[0-9].[0-9].[0-9]')"
+    - "echo $VERSION"
+    - "docker login -u fairdataaustria -p ${DOCKER_REGISTRY_PASSWORD}"
+    - "docker tag fda-metadata-db fairdataaustria/fda-metadata-db:$VERSION"
+    - "docker tag fda-analyse-service fairdataaustria/fda-analyse-service:$VERSION"
+    - "docker tag fda-broker-service fairdataaustria/fda-broker-service:$VERSION"
+    - "docker tag fda-citation-service fairdataaustria/fda-citation-service:$VERSION"
+    - "docker tag fda-container-service fairdataaustria/fda-container-service:$VERSION"
+    - "docker tag fda-database-service fairdataaustria/fda-database-service:$VERSION"
+    - "docker tag fda-discovery-service fairdataaustria/fda-discovery-service:$VERSION"
+    - "docker tag fda-gateway-service fairdataaustria/fda-gateway-service:$VERSION"
+    - "docker tag fda-query-service fairdataaustria/fda-query-service:$VERSION"
+    - "docker tag fda-table-service fairdataaustria/fda-table-service:$VERSION"
+    - "docker tag fda-ui fairdataaustria/fda-ui:$VERSION"
+    - "docker push fairdataaustria/fda-metadata-db:$VERSION"
+    - "docker push fairdataaustria/fda-analyse-service:$VERSION"
+    - "docker push fairdataaustria/fda-broker-service:$VERSION"
+    - "docker push fairdataaustria/fda-citation-service:$VERSION"
+    - "docker push fairdataaustria/fda-container-service:$VERSION"
+    - "docker push fairdataaustria/fda-discovery-service:$VERSION"
+    - "docker push fairdataaustria/fda-database-service:$VERSION"
+    - "docker push fairdataaustria/fda-gateway-service:$VERSION"
+    - "docker push fairdataaustria/fda-query-service:$VERSION"
+    - "docker push fairdataaustria/fda-table-service:$VERSION"
diff --git a/README.md b/README.md
index 908996116d53887c7f6098a113b63b31557d1a8b..011a8f124c5d5819f157609bbc8b3ad5bff3ac42 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,10 @@
 
 # FAIR Data Austria Database Repository
 
+## Install
+
+Obtain the newest
+
 ## Build
 
 Everything is handled by compose, just build it by running: