diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9485b6181ffcd02d23d37df6a93eba3294369192
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,37 @@
+[bumpversion]
+current_version = 1.0.0-rc.2
+commit = True
+tag = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
+serialize = 
+	{major}.{minor}.{patch}-{release}.{build}
+	{major}.{minor}.{patch}
+tag_name = release-{new_version}
+
+[bumpversion:part:release]
+optional_value = final
+first_value = alpha
+values = 
+	alpha
+	beta
+	rc
+	final
+
+[bumpversion:file:.bumpversion.cfg]
+search = current_version = {current_version}
+
+[bumpversion:glob:**/Dockerfile]
+search = version="{current_version}"
+replace = version="{new_version}"
+
+[bumpversion:glob:preprocessor/setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
+
+[bumpversion:glob:docker-compose*ops.yml]
+search = :release-{current_version}
+replace = :release-{new_version}
+
+[bumpversion:glob:config/*ops.html]
+search = release-{current_version}
+replace = release-{new_version}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de2ece8a34372a189edb70a8e79aef700e7a5c24..0a8cf8e653ff4653aff6558e2cd05dedf388645b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,37 @@ variables:
 stages:
   - build
 
-
-build-master:
+build-tag:
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core"
+    - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$CI_COMMIT_TAG core/
+    - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor"
+    - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$CI_COMMIT_TAG preprocessor/
+    - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client"
+    - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$CI_COMMIT_TAG client/
+    - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache"
+    - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$CI_COMMIT_TAG cache/
+    - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd"
+    - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$CI_COMMIT_TAG fluentd/
+    - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor"
+    - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/
+    - cd ./testing && ./gitlab_test.sh
+    - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
+    - docker push "$IMAGE_1":$CI_COMMIT_TAG
+    - docker push "$IMAGE_2":$CI_COMMIT_TAG
+    - docker push "$IMAGE_3":$CI_COMMIT_TAG
+    - docker push "$IMAGE_4":$CI_COMMIT_TAG
+    - docker push "$IMAGE_5":$CI_COMMIT_TAG
+    - docker push "$IMAGE_6":$CI_COMMIT_TAG
+  only:
+    - tags
+build-master-staging:
   image: docker:latest
   stage: build
   services:
@@ -13,46 +42,31 @@ build-master:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - VERSION_1=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2`
+    - if [[ "$CI_COMMIT_BRANCH" = "master" ]] ; then TAG_USED="latest"; else TAG_USED="staging"; fi
     - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core"
-    - docker pull "$IMAGE_1":latest || true
-    - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":dev -t "$IMAGE_1":$VERSION_1 core/
-    - VERSION_2=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2`
+    - docker build --cache-from "$IMAGE_1":"$TAG_USED" -t "$IMAGE_1":dev -t "$IMAGE_1":"$TAG_USED" core/
     - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor"
-    - docker pull "$IMAGE_2":latest || true
-    - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":dev -t "$IMAGE_2":$VERSION_2 preprocessor/
-    - VERSION_3=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2`
+    - docker build --cache-from "$IMAGE_2":"$TAG_USED" -t "$IMAGE_2":dev -t "$IMAGE_2":"$TAG_USED" preprocessor/
     - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client"
-    - docker pull "$IMAGE_3":latest || true
-    - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":dev -t "$IMAGE_3":$VERSION_3 client/
-    - VERSION_4=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2`
+    - docker build --cache-from "$IMAGE_3":"$TAG_USED" -t "$IMAGE_3":dev -t "$IMAGE_3":"$TAG_USED" client/
     - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache"
-    - docker pull "$IMAGE_4":latest || true
-    - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":dev -t "$IMAGE_4":$VERSION_4 cache/
-    - VERSION_5=`grep 'version="*"' fluentd/Dockerfile | cut -d '"' -f2`
+    - docker build --cache-from "$IMAGE_4":"$TAG_USED" -t "$IMAGE_4":dev -t "$IMAGE_4":"$TAG_USED" cache/
     - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd"
-    - docker pull "$IMAGE_5":latest || true
-    - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":dev -t "$IMAGE_5":$VERSION_5 fluentd/
-    - VERSION_6=`grep 'version="*"' ingestor/Dockerfile | cut -d '"' -f2`
+    - docker build --cache-from "$IMAGE_5":"$TAG_USED" -t "$IMAGE_5":dev -t "$IMAGE_5":"$TAG_USED" fluentd/
     - IMAGE_6="$CI_REGISTRY_IMAGE/pvs_ingestor"
-    - docker pull "$IMAGE_6":latest || true
-    - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$VERSION_6 ingestor/
+    - docker build --cache-from "$IMAGE_6":"$TAG_USED" -t "$IMAGE_6":dev -t "$IMAGE_6":"$TAG_USED" ingestor/
     - cd ./testing && ./gitlab_test.sh
     - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
-    - docker push "$IMAGE_1":$VERSION_1
-    - docker push "$IMAGE_1":latest
-    - docker push "$IMAGE_2":$VERSION_2
-    - docker push "$IMAGE_2":latest
-    - docker push "$IMAGE_3":$VERSION_3
-    - docker push "$IMAGE_3":latest
-    - docker push "$IMAGE_4":$VERSION_4
-    - docker push "$IMAGE_4":latest
-    - docker push "$IMAGE_5":$VERSION_5
-    - docker push "$IMAGE_5":latest
-    - docker push "$IMAGE_6":$VERSION_6
-    - docker push "$IMAGE_6":latest
+    - docker push "$IMAGE_1":"$TAG_USED"
+    - docker push "$IMAGE_2":"$TAG_USED"
+    - docker push "$IMAGE_3":"$TAG_USED"
+    - docker push "$IMAGE_4":"$TAG_USED"
+    - docker push "$IMAGE_5":"$TAG_USED"
+    - docker push "$IMAGE_6":"$TAG_USED"
   only:
+    - staging
     - master
+  except:
     - tags
 build:
   image: docker:latest
@@ -63,24 +77,20 @@ build:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev core/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev core/
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev preprocessor/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev preprocessor/
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev client/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev client/
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev cache/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev cache/
     - IMAGE="$CI_REGISTRY_IMAGE/fluentd"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev fluentd/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev fluentd/
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_ingestor"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":dev ingestor/
+    - docker build --cache-from "$IMAGE":staging -t "$IMAGE":dev ingestor/
     - cd ./testing && ./gitlab_test.sh
     - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
   except:
+    - tags
+    - staging
     - master
diff --git a/README.md b/README.md
index fff3c4968fbd172317d9a8ee5f13f16fdb97adf4..5eac58361ab188aa0cbc9c71760af7c15e30d926 100644
--- a/README.md
+++ b/README.md
@@ -294,7 +294,6 @@ You will log in  into`/home/eox/data` directory which contains the 2 logging dir
 
  **NOTE:**  The mounted directory that you are directed into is *`/home/user`*, where `user` is the username, hence when setting / editing  the username in configs, the `sftp` mounted volumes path in `docker-compose.<collection>.yml` must change respectively.
  
-
 # Documentation
 
 ## Installation
@@ -323,6 +322,21 @@ The documentation is generated in the respective *_build/html* directory.
 
 # Create software releases
 
+## Release a new vs version
+
+We use [bump2version](https://github.com/c4urself/bump2version) to increment versions of invividual docker images and create git tags. Tags after push trigger CI `docker push` action of versioned images. It also updates used image versions in `.ops` docker compose files.
+
+Pushing to `master` branch updates `latest` images, while `staging` branch push updates `staging` images.
+For **versions** in general, we use semantic versioning with format {major}.{minor}.{patch}-{release}.{build}.
+First check deployed staging version on staging platform (TBD), then if no problems are found, proceed.
+Following operation should be done on `staging` or `master` branch.
+```
+bump2version <major/minor/patch/release/build>
+git push
+git push --tags
+```
+If it was done on `staging` branch, then it should be merged to `master`, unless only a patch to previous major versions is made.
+A hotfix to production is developed in a branch initiated from master, then merged to staging for verification. It is then merged to master for release.
 ## Source code release
 
 Create a TAR from source code:
diff --git a/cache/Dockerfile b/cache/Dockerfile
index 4653a2a727929a0851551864e3300af66a29ed45..57abc9760abf48796ffd709995e49f75bec4a02b 100644
--- a/cache/Dockerfile
+++ b/cache/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server cache" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 USER root
 ADD install.sh \
diff --git a/client/Dockerfile b/client/Dockerfile
index 9da01c45e88e4e9e28b8854bae6f7554d9d9bf5e..2255e745416052b932c5af8c7b6e0375b76773d9 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -31,6 +31,6 @@ LABEL name="prism view server client" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server client" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 COPY html/ /usr/share/nginx/html/
diff --git a/config/dem_index-dev.html b/config/dem_index-dev.html
index 6251a3c153b5323dbb962bc7aadea1607286b396..c4f904b8400dbd65a8698664ecd196cf7db3aa5b 100644
--- a/config/dem_index-dev.html
+++ b/config/dem_index-dev.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html
index c8c6083111405529c2344632f30992da0df5df57..77b34692deedd764c8a770fbfbf0e33e91d5da18 100644
--- a/config/dem_index-ops.html
+++ b/config/dem_index-ops.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/emg_index-dev.html b/config/emg_index-dev.html
index 9fdbd8e5a3ec122f5adc9cbcb8590a5d1f93d96e..09e3e675909e41269837eb5108c1b5b7c5f9fec5 100644
--- a/config/emg_index-dev.html
+++ b/config/emg_index-dev.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html
index d53feee51897b8140659d17d89a3df538a5b746a..171adcd85091adc22d7482b443e0594a298be070 100644
--- a/config/emg_index-ops.html
+++ b/config/emg_index-ops.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/vhr18_index-dev.html b/config/vhr18_index-dev.html
index 800b881ae8b57374b89d9125d8eb21c8eef65253..d517d3344f24401b159566813e906c8faa4d1ef8 100644
--- a/config/vhr18_index-dev.html
+++ b/config/vhr18_index-dev.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html
index 2fe8a273a36b070f0205689ac1e6602f70d85081..7000f3f1495c517a36b7377b069d260c462f9544 100644
--- a/config/vhr18_index-ops.html
+++ b/config/vhr18_index-ops.html
@@ -3,6 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta charset="UTF-8">
+  <meta name="application" content="VS Client release-1.0.0-rc.2">
   <title>PRISM View Server</title>
   <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
   <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/core/Dockerfile b/core/Dockerfile
index 4bdce96b93bfd307939fd8fb122f54b4ca933c62..b8c8148d756b1b001327d16a3df038e456ee4698 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server core" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server core" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 USER root
 
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index 5aac2ba8e5d0f251bae5a89d82edf3ca513da292..2d6ade931593401487ae790393608215522ba3f9 100644
--- a/docker-compose.base.ops.yml
+++ b/docker-compose.base.ops.yml
@@ -1,4 +1,5 @@
 version: "3.6"
+x-vs-version: :release-1.0.0-rc.2 # bumpversion
 services:
   reverse-proxy:
     image: traefik:2.1
diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml
index 6cccbfbdcba5d165994d37a0acea01ed4dec791a..012016bd1a39eaa1a22fb9dc0d6b769998fa404d 100644
--- a/docker-compose.dem.ops.yml
+++ b/docker-compose.dem.ops.yml
@@ -1,4 +1,5 @@
 version: "3.6"
+x-vs-version: :release-1.0.0-rc.2 # bumpversion
 services:
   database:
     volumes:
@@ -7,6 +8,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +50,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +93,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +103,7 @@ services:
         constraints:
           - node.labels.type == internal
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +131,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +141,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
 networks:
   extnet:
     name: dem-extnet
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index 7517f1aeb239483400662957a69a7708ccd37ab4..94ec7a1840009a817f1749e534adc5233f5a13ab 100644
--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
@@ -1,4 +1,5 @@
 version: "3.6"
+x-vs-version: :release-1.0.0-rc.2 # bumpversion
 services:
   database:
     volumes:
@@ -7,6 +8,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +50,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +93,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +103,7 @@ services:
         constraints:
           - node.labels.type == internal
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +131,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +141,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
 networks:
   extnet:
     name: emg-extnet
diff --git a/docker-compose.logging.dev.yml b/docker-compose.logging.dev.yml
index d749cb97edd584b85c8bbe46b708d06e2653ee1f..38af28cf99c70815163231a8c13e91e5798c8e4b 100644
--- a/docker-compose.logging.dev.yml
+++ b/docker-compose.logging.dev.yml
@@ -1,5 +1,7 @@
 version: "3.6"
 services:
+  fluentd:
+    image: registry.gitlab.eox.at/esa/prism/vs/fluentd:dev
   elasticsearch:
     ports:
       - "9200:9200"
diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml
index 53434247c97cc5ba62880d1ca8eafc2a81731d0c..2a6437f7bb7efb509dc0558bb113a1e80966785d 100644
--- a/docker-compose.logging.ops.yml
+++ b/docker-compose.logging.ops.yml
@@ -1,11 +1,12 @@
 version: "3.6"
+x-vs-version: :release-1.0.0-rc.2 # bumpversion
 services:
   fluentd:
+    image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0-rc.2 # bumpversion
     deploy:
       placement:
         # this is not strictly required, but feels right
         constraints: [node.role == manager]
-
   elasticsearch:
     environment:
       - bootstrap.memory_lock=true
diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml
index fef2a0d2f987e35fc781a29fb376f2c78584bcd9..024ac46c9d69b5e81176bb0a9daf4646cb453fd0 100644
--- a/docker-compose.vhr18.ops.yml
+++ b/docker-compose.vhr18.ops.yml
@@ -1,4 +1,5 @@
 version: "3.6"
+x-vs-version: :release-1.0.0-rc.2 # bumpversion
 services:
   database:
     volumes:
@@ -7,6 +8,7 @@ services:
         tmpfs:
           size: 536870912
   renderer:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -48,6 +50,7 @@ services:
     networks:
       - extnet
   cache:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: mapcache-ops
         target: /mapcache-template.xml
@@ -90,6 +93,7 @@ services:
     networks:
       - extnet
   registrar:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
     environment:
       INSTALL_DIR: "/var/www/pvs/ops/"
       INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -99,6 +103,7 @@ services:
         constraints:
           - node.labels.type == internal      
   client:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
     configs:
       - source: client-ops
         target: /usr/share/nginx/html/index.html
@@ -126,6 +131,7 @@ services:
     networks:
       - extnet
   preprocessor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
     volumes:
       - type: bind
         source: /var/vhr
@@ -135,6 +141,8 @@ services:
       placement:
         constraints:
           - node.labels.type == internal
+  ingestor:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
 networks:
   extnet:
     name: vhr18-extnet
diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile
index fb2dfae9469b57e2afd689b7b9b28b7cdee3432c..0bc13cb9a9e897b37f524c25cf252de1618dfb0a 100644
--- a/fluentd/Dockerfile
+++ b/fluentd/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server fluentd" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 USER root
 RUN gem install fluent-plugin-elasticsearch \
diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile
index 61afce217f6e28ee66023eadb0cd0047336f68b4..e1b80dcf0380cee38ec5daedebeaa3030b6499a5 100644
--- a/ingestor/Dockerfile
+++ b/ingestor/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server ingestor" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 USER root
 ADD install.sh requirements.txt \
diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile
index b7da584f7aa2e019516b9c64c87342ce2f155486..987d52b45bdba74919d3ded16be968d27bdff789 100644
--- a/preprocessor/Dockerfile
+++ b/preprocessor/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \
       vendor="EOX IT Services GmbH <https://eox.at>" \
       license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
       type="prism view server preprocessor" \
-      version="0.0.1-dev"
+      version="1.0.0-rc.2"
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
diff --git a/preprocessor/setup.py b/preprocessor/setup.py
index 56f894a93464471f2c79817b005ab906dcf5bf73..34c7a2e8ab38a7a4de69816040821b4ed3cde398 100644
--- a/preprocessor/setup.py
+++ b/preprocessor/setup.py
@@ -6,7 +6,7 @@ long_description = ""
 
 setup(
     name="preprocessor", # Replace with your own username
-    version="0.0.1",
+    version="1.0.0-rc.2",
     author="",
     author_email="",
     description="preprocessor for PVS",