diff --git a/lxc-apps/ckan/app b/lxc-apps/ckan/app
index 320a7ae..1a8ba39 100644
--- a/lxc-apps/ckan/app
+++ b/lxc-apps/ckan/app
@@ -1,5 +1,5 @@
 {
-    "version": "2.8.3-200403",
+    "version": "2.8.3-200621",
     "meta": {
         "title": "CKAN",
         "desc-cs": "Datový sklad",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "ckan": {
-            "image": "ckan_2.8.3-200403",
+            "image": "ckan_2.8.3-200621",
             "depends": [
                 "ckan-datapusher",
                 "ckan-redis",
@@ -21,27 +21,27 @@
             }
         },
         "ckan-datapusher": {
-            "image": "ckan-datapusher_0.0.16-200403",
+            "image": "ckan-datapusher_0.0.16-200621",
             "mounts": {
                 "ckan/datapusher_conf": "etc/ckan-datapusher",
                 "ckan/datapusher_data": "srv/ckan-datapusher/data"
             }
         },
         "ckan-redis": {
-            "image": "redis_5.0.7-200403",
+            "image": "redis_5.0.7-200621",
             "mounts": {
                 "ckan/redis_conf/redis.conf": "etc/redis.conf:file",
                 "ckan/redis_data": "var/lib/redis"
             }
         },
         "ckan-solr": {
-            "image": "solr6_6.5.1-200403",
+            "image": "solr6_6.5.1-200621",
             "mounts": {
                 "ckan/solr_data": "var/lib/solr"
             }
         },
         "ckan-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "ckan/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/ckan/ckan-datapusher.image b/lxc-apps/ckan/ckan-datapusher.image
index c4803cb..6000c8b 100644
--- a/lxc-apps/ckan/ckan-datapusher.image
+++ b/lxc-apps/ckan/ckan-datapusher.image
@@ -1,5 +1,5 @@
-IMAGE ckan-datapusher_0.0.16-200403
-FROM alpine3.10-python2.7_2.7.16-200403
+IMAGE ckan-datapusher_0.0.16-200621
+FROM alpine3.10-python2.7_2.7.16-200621
 # Alpine 3.11 discontinued uwsgi-python2 module
 
 RUN EOF
diff --git a/lxc-apps/ckan/ckan.image b/lxc-apps/ckan/ckan.image
index 8093d4b..27d3ff7 100644
--- a/lxc-apps/ckan/ckan.image
+++ b/lxc-apps/ckan/ckan.image
@@ -1,5 +1,5 @@
-IMAGE ckan_2.8.3-200403
-FROM alpine3.11-python2.7_2.7.16-200403
+IMAGE ckan_2.8.3-200621
+FROM alpine3.11-python2.7_2.7.16-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh
index 5719589..e3b76c3 100755
--- a/lxc-apps/ckan/install.sh
+++ b/lxc-apps/ckan/install.sh
@@ -6,7 +6,7 @@ POSTGRES_DATA="${VOLUMES_DIR}/ckan/postgres_data"
 REDIS_CONF="${VOLUMES_DIR}/ckan/redis_conf"
 REDIS_DATA="${VOLUMES_DIR}/ckan/redis_data"
 SOLR_DATA="${VOLUMES_DIR}/ckan/solr_data"
-SOLR_LAYER="${LAYERS_DIR}/solr6_6.5.1-200403"
+SOLR_LAYER="${LAYERS_DIR}/solr6_6.5.1-200621"
 DATAPUSHER_CONF="${VOLUMES_DIR}/ckan/datapusher_conf"
 DATAPUSHER_DATA="${VOLUMES_DIR}/ckan/datapusher_data"
 CKAN_CONF="${VOLUMES_DIR}/ckan/ckan_conf"
diff --git a/lxc-apps/crisiscleanup/app b/lxc-apps/crisiscleanup/app
index f6eab0d..5f79bb6 100644
--- a/lxc-apps/crisiscleanup/app
+++ b/lxc-apps/crisiscleanup/app
@@ -1,5 +1,5 @@
 {
-    "version": "2.2.0-200403",
+    "version": "2.2.0-200621",
     "meta": {
         "title": "Crisis Cleanup",
         "desc-cs": "Mapování následků katastrof",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "crisiscleanup": {
-            "image": "crisiscleanup_2.2.0-200403",
+            "image": "crisiscleanup_2.2.0-200621",
             "depends": [
                 "crisiscleanup-postgres"
             ],
@@ -17,7 +17,7 @@
             }
         },
         "crisiscleanup-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "crisiscleanup/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/crisiscleanup/image b/lxc-apps/crisiscleanup/image
index 32edcaf..66f1eb7 100644
--- a/lxc-apps/crisiscleanup/image
+++ b/lxc-apps/crisiscleanup/image
@@ -1,5 +1,5 @@
-IMAGE crisiscleanup_2.2.0-200403
-FROM alpine3.8-ruby2.4_2.4.9-200403
+IMAGE crisiscleanup_2.2.0-200621
+FROM alpine3.8-ruby2.4_2.4.9-200621
 # yarn dependencies installation fails on nodejs>8
 
 ENV RAILS_ENV production
diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh
index 1b826fc..53e4cfe 100755
--- a/lxc-apps/crisiscleanup/install.sh
+++ b/lxc-apps/crisiscleanup/install.sh
@@ -4,7 +4,7 @@ set -ev
 # Volumes
 POSTGRES_DATA="${VOLUMES_DIR}/crisiscleanup/postgres_data"
 CC_CONF="${VOLUMES_DIR}/crisiscleanup/cc_conf"
-CC_LAYER="${LAYERS_DIR}/crisiscleanup_2.2.0-200403"
+CC_LAYER="${LAYERS_DIR}/crisiscleanup_2.2.0-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/cts/app b/lxc-apps/cts/app
index 1f26d47..8ec49c5 100644
--- a/lxc-apps/cts/app
+++ b/lxc-apps/cts/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.8.0-200403",
+    "version": "0.8.0-200621",
     "meta": {
         "title": "CTS",
         "desc-cs": "Sledovací systém komodit",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "cts": {
-            "image": "cts_0.8.0-200403",
+            "image": "cts_0.8.0-200621",
             "depends": [
                 "cts-postgres"
             ],
@@ -17,7 +17,7 @@
             }
         },
         "cts-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "cts/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/cts/image b/lxc-apps/cts/image
index 7d64476..bd0bd54 100644
--- a/lxc-apps/cts/image
+++ b/lxc-apps/cts/image
@@ -1,5 +1,5 @@
-IMAGE cts_0.8.0-200403
-FROM alpine3.11-python2.7_2.7.16-200403
+IMAGE cts_0.8.0-200621
+FROM alpine3.11-python2.7_2.7.16-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh
index 0e91e57..2deb56f 100755
--- a/lxc-apps/cts/install.sh
+++ b/lxc-apps/cts/install.sh
@@ -4,7 +4,7 @@ set -ev
 # Volumes
 POSTGRES_DATA="${VOLUMES_DIR}/cts/postgres_data"
 CTS_CONF="${VOLUMES_DIR}/cts/cts_conf"
-CTS_LAYER="${LAYERS_DIR}/cts_0.8.0-200403"
+CTS_LAYER="${LAYERS_DIR}/cts_0.8.0-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/decidim/app b/lxc-apps/decidim/app
index d460d14..a3b19fe 100644
--- a/lxc-apps/decidim/app
+++ b/lxc-apps/decidim/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.20.1-200403",
+    "version": "0.20.1-200621",
     "meta": {
         "title": "Decidim",
         "desc-cs": "Platforma pro účast občanů",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "decidim": {
-            "image": "decidim_0.20.1-200403",
+            "image": "decidim_0.20.1-200621",
             "depends": [
                 "decidim-postgres"
             ],
@@ -19,7 +19,7 @@
             }
         },
         "decidim-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "decidim/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/decidim/image b/lxc-apps/decidim/image
index ffbb200..02d953d 100644
--- a/lxc-apps/decidim/image
+++ b/lxc-apps/decidim/image
@@ -1,5 +1,5 @@
-IMAGE decidim_0.20.1-200403
-FROM alpine3.11-ruby2.6_2.6.5-200403
+IMAGE decidim_0.20.1-200621
+FROM alpine3.11-ruby2.6_2.6.5-200621
 
 # https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md
 # https://github.com/Platoniq/decidim-install/blob/master/basic-config.md
diff --git a/lxc-apps/decidim/install.sh b/lxc-apps/decidim/install.sh
index c9219a3..800378e 100755
--- a/lxc-apps/decidim/install.sh
+++ b/lxc-apps/decidim/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/decidim/postgres_data"
 DECIDIM_CONF="${VOLUMES_DIR}/decidim/decidim_conf"
 DECIDIM_DATA="${VOLUMES_DIR}/decidim/decidim_data"
-DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.20.1-200403"
+DECIDIM_LAYER="${LAYERS_DIR}/decidim_0.20.1-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/frontlinesms/app b/lxc-apps/frontlinesms/app
index 73c3929..dd40e95 100644
--- a/lxc-apps/frontlinesms/app
+++ b/lxc-apps/frontlinesms/app
@@ -1,5 +1,5 @@
 {
-    "version": "2.6.5-200403",
+    "version": "2.6.5-200621",
     "meta": {
         "title": "FrontlineSMS",
         "desc-cs": "Hromadné odesílání zpráv",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "frontlinesms": {
-            "image": "frontlinesms_2.6.5-200403",
+            "image": "frontlinesms_2.6.5-200621",
             "mounts": {
                 "frontlinesms/flsms_data": "srv/frontlinesms/.frontlinesms2"
             }
diff --git a/lxc-apps/frontlinesms/image b/lxc-apps/frontlinesms/image
index 7257650..44fd68d 100644
--- a/lxc-apps/frontlinesms/image
+++ b/lxc-apps/frontlinesms/image
@@ -1,5 +1,5 @@
-IMAGE frontlinesms_2.6.5-200403
-FROM alpine3.8-java8_8.222.10-200403
+IMAGE frontlinesms_2.6.5-200621
+FROM alpine3.8-java8_8.222.10-200621
 # HTTP connection accept fails on Java 8.242
 
 RUN EOF
diff --git a/lxc-apps/gnuhealth/app b/lxc-apps/gnuhealth/app
index 9bce532..e429429 100644
--- a/lxc-apps/gnuhealth/app
+++ b/lxc-apps/gnuhealth/app
@@ -1,5 +1,5 @@
 {
-    "version": "3.6.3-200403",
+    "version": "3.6.3-200621",
     "meta": {
         "title": "GNU Health",
         "desc-cs": "Lékařské záznamy pacientů",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "gnuhealth": {
-            "image": "gnuhealth_3.6.3-200403",
+            "image": "gnuhealth_3.6.3-200621",
             "depends": [
                 "gnuhealth-postgres"
             ],
@@ -17,7 +17,7 @@
             }
         },
         "gnuhealth-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "gnuhealth/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/gnuhealth/image b/lxc-apps/gnuhealth/image
index 7c3f8b3..778d707 100644
--- a/lxc-apps/gnuhealth/image
+++ b/lxc-apps/gnuhealth/image
@@ -1,5 +1,5 @@
-IMAGE gnuhealth_3.6.3-200403
-FROM alpine3.11-python3.8_3.8.2-200403
+IMAGE gnuhealth_3.6.3-200621
+FROM alpine3.11-python3.8_3.8.2-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/kanboard/app b/lxc-apps/kanboard/app
index ef8de16..dc13a1e 100644
--- a/lxc-apps/kanboard/app
+++ b/lxc-apps/kanboard/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.2.14-200416",
+    "version": "1.2.14-200621",
     "meta": {
         "title": "Kanboard",
         "desc-cs": "Kanban řízení projektů",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "kanboard": {
-            "image": "kanboard_1.2.14-200416",
+            "image": "kanboard_1.2.14-200621",
             "depends": [
                 "kanboard-postgres"
             ],
@@ -18,7 +18,7 @@
             }
         },
         "kanboard-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "kanboard/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/kanboard/image b/lxc-apps/kanboard/image
index d69e92d..d45fb18 100644
--- a/lxc-apps/kanboard/image
+++ b/lxc-apps/kanboard/image
@@ -1,5 +1,5 @@
-IMAGE kanboard_1.2.14-200416
-FROM alpine3.11-php7.3_7.3.16-200403
+IMAGE kanboard_1.2.14-200621
+FROM alpine3.11-php7.3_7.3.16-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/mifosx/app b/lxc-apps/mifosx/app
index 7f014e4..01eb3db 100644
--- a/lxc-apps/mifosx/app
+++ b/lxc-apps/mifosx/app
@@ -1,5 +1,5 @@
 {
-    "version": "18.03.01-200403",
+    "version": "18.03.01-200621",
     "meta": {
         "title": "Mifos X",
         "desc-cs": "Mikrofinancování rozvojových projektů",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "mifosx": {
-            "image": "mifosx_18.03.01-200403",
+            "image": "mifosx_18.03.01-200621",
             "depends": [
                 "mifosx-mariadb"
             ],
@@ -18,7 +18,7 @@
             }
         },
         "mifosx-mariadb": {
-            "image": "mariadb_10.4.12-200403",
+            "image": "mariadb_10.4.12-200621",
             "mounts": {
                 "mifosx/mariadb_conf/my.cnf": "etc/my.cnf:file",
                 "mifosx/mariadb_data": "var/lib/mysql"
diff --git a/lxc-apps/mifosx/image b/lxc-apps/mifosx/image
index 012901a..784b286 100644
--- a/lxc-apps/mifosx/image
+++ b/lxc-apps/mifosx/image
@@ -1,5 +1,5 @@
-IMAGE mifosx_18.03.01-200403
-FROM alpine3.11-tomcat8.5_8.5.53-200403
+IMAGE mifosx_18.03.01-200621
+FROM alpine3.11-tomcat8.5_8.5.53-200621
 
 RUN EOF
     # Install full-featured wget to work around sourceforge bugs
diff --git a/lxc-apps/motech/app b/lxc-apps/motech/app
index a0afc6f..7e4e28a 100644
--- a/lxc-apps/motech/app
+++ b/lxc-apps/motech/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.3.0-200403",
+    "version": "1.3.0-200621",
     "meta": {
         "title": "Motech",
         "desc-cs": "Automatizace komunikace",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "motech": {
-            "image": "motech_1.3.0-200403",
+            "image": "motech_1.3.0-200621",
             "depends": [
                 "motech-activemq",
                 "motech-postgres"
@@ -18,14 +18,14 @@
             }
         },
         "motech-activemq": {
-            "image": "activemq_5.15.9-200403",
+            "image": "activemq_5.15.9-200621",
             "mounts": {
                 "motech/activemq_conf/activemq.xml": "srv/activemq/conf/activemq.xml:file",
                 "motech/activemq_data": "srv/activemq/data"
             }
         },
         "motech-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "motech/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/motech/image b/lxc-apps/motech/image
index af7f12a..7bbb832 100644
--- a/lxc-apps/motech/image
+++ b/lxc-apps/motech/image
@@ -1,5 +1,5 @@
-IMAGE motech_1.3.0-200403
-FROM alpine3.11-tomcat7_7.0.103-200403
+IMAGE motech_1.3.0-200621
+FROM alpine3.11-tomcat7_7.0.103-200621
 
 RUN EOF
     # Download Motech
diff --git a/lxc-apps/odoo/app b/lxc-apps/odoo/app
index 37a08ce..b0a67df 100644
--- a/lxc-apps/odoo/app
+++ b/lxc-apps/odoo/app
@@ -1,5 +1,5 @@
 {
-    "version": "13.0.0-200403",
+    "version": "13.0.0-200621",
     "meta": {
         "title": "Odoo",
         "desc-cs": "Sada aplikací pro správu organizace",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "odoo": {
-            "image": "odoo_13.0.0-200403",
+            "image": "odoo_13.0.0-200621",
             "depends": [
                 "odoo-postgres"
             ],
@@ -18,7 +18,7 @@
             }
         },
         "odoo-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "odoo/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/odoo/image b/lxc-apps/odoo/image
index 495d61b..7f44aab 100644
--- a/lxc-apps/odoo/image
+++ b/lxc-apps/odoo/image
@@ -1,5 +1,5 @@
-IMAGE odoo_13.0.0-200403
-FROM alpine3.11-python3.8_3.8.2-200403
+IMAGE odoo_13.0.0-200621
+FROM alpine3.11-python3.8_3.8.2-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/opendatakit/app b/lxc-apps/opendatakit/app
index 97654d8..80c33a8 100644
--- a/lxc-apps/opendatakit/app
+++ b/lxc-apps/opendatakit/app
@@ -1,5 +1,5 @@
 {
-    "version": "2.0.5-200403",
+    "version": "2.0.5-200621",
     "meta": {
         "title": "OpenDataKit",
         "desc-cs": "Sběr formulářových dat",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "opendatakit": {
-            "image": "opendatakit_2.0.5-200403",
+            "image": "opendatakit_2.0.5-200621",
             "depends": [
                 "opendatakit-postgres"
             ],
@@ -19,7 +19,7 @@
             }
         },
         "opendatakit-build": {
-            "image": "opendatakit-build_0.3.5-200403",
+            "image": "opendatakit-build_0.3.5-200621",
             "depends": [
                 "opendatakit-postgres"
             ],
@@ -29,7 +29,7 @@
             }
         },
         "opendatakit-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "opendatakit/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/opendatakit/opendatakit-build.image b/lxc-apps/opendatakit/opendatakit-build.image
index a0925a4..3d20d21 100644
--- a/lxc-apps/opendatakit/opendatakit-build.image
+++ b/lxc-apps/opendatakit/opendatakit-build.image
@@ -1,5 +1,5 @@
-IMAGE opendatakit-build_0.3.5-200403
-FROM alpine3.11-ruby2.4_2.4.9-200403
+IMAGE opendatakit-build_0.3.5-200621
+FROM alpine3.11-ruby2.4_2.4.9-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/opendatakit/opendatakit.image b/lxc-apps/opendatakit/opendatakit.image
index d26a10b..088d825 100644
--- a/lxc-apps/opendatakit/opendatakit.image
+++ b/lxc-apps/opendatakit/opendatakit.image
@@ -1,5 +1,5 @@
-IMAGE opendatakit_2.0.5-200403
-FROM alpine3.11-tomcat8.5_8.5.53-200403
+IMAGE opendatakit_2.0.5-200621
+FROM alpine3.11-tomcat8.5_8.5.53-200621
 
 RUN EOF
     # Download OpenDataKit
diff --git a/lxc-apps/openmapkit/app b/lxc-apps/openmapkit/app
index 6a0f736..35bc545 100644
--- a/lxc-apps/openmapkit/app
+++ b/lxc-apps/openmapkit/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.12.0-200403",
+    "version": "0.12.0-200621",
     "meta": {
         "title": "OpenMapKit",
         "desc-cs": "Sběr mapových dat",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "openmapkit": {
-            "image": "openmapkit_0.12.0-200403",
+            "image": "openmapkit_0.12.0-200621",
             "mounts": {
                 "openmapkit/omk_conf/settings.js": "srv/openmapkit/settings.js:file",
                 "openmapkit/omk_data": "srv/openmapkit/data"
diff --git a/lxc-apps/openmapkit/image b/lxc-apps/openmapkit/image
index ea03224..1c5875c 100644
--- a/lxc-apps/openmapkit/image
+++ b/lxc-apps/openmapkit/image
@@ -1,5 +1,5 @@
-IMAGE openmapkit_0.12.0-200403
-FROM alpine3.10-nodejs10_10.19.0-200403
+IMAGE openmapkit_0.12.0-200621
+FROM alpine3.10-nodejs10_10.19.0-200621
 # libxmljs installation fails on nodejs>10
 
 RUN EOF
diff --git a/lxc-apps/openmapkit/install.sh b/lxc-apps/openmapkit/install.sh
index 27eb3ea..670fbf4 100755
--- a/lxc-apps/openmapkit/install.sh
+++ b/lxc-apps/openmapkit/install.sh
@@ -4,7 +4,7 @@ set -ev
 # Volumes
 OMK_CONF="${VOLUMES_DIR}/openmapkit/omk_conf"
 OMK_DATA="${VOLUMES_DIR}/openmapkit/omk_data"
-OMK_LAYER="${LAYERS_DIR}/openmapkit_0.12.0-200403"
+OMK_LAYER="${LAYERS_DIR}/openmapkit_0.12.0-200621"
 
 # Configure OpenMapKit
 export OPENMAPKIT_ADMIN_USER="admin"
diff --git a/lxc-apps/pandora/app b/lxc-apps/pandora/app
index 161987d..1d0dbd5 100644
--- a/lxc-apps/pandora/app
+++ b/lxc-apps/pandora/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200621",
     "meta": {
         "title": "Pan.do/ra",
         "desc-cs": "Archiv medií",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "pandora": {
-            "image": "pandora_0.0.1-200403",
+            "image": "pandora_0.0.1-200621",
             "depends": [
                 "pandora-postgres",
                 "pandora-rabbitmq"
@@ -19,13 +19,13 @@
             }
         },
         "pandora-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "pandora/postgres_data": "var/lib/postgresql"
             }
         },
         "pandora-rabbitmq": {
-            "image": "rabbitmq_3.7.18-200403",
+            "image": "rabbitmq_3.7.18-200621",
             "mounts": {
                 "pandora/rabbitmq_data": "var/lib/rabbitmq/mnesia"
             }
diff --git a/lxc-apps/pandora/image b/lxc-apps/pandora/image
index c714b9c..8a7cb90 100644
--- a/lxc-apps/pandora/image
+++ b/lxc-apps/pandora/image
@@ -1,5 +1,5 @@
-IMAGE pandora_0.0.1-200403
-FROM alpine3.10-python3.7_3.7.5-200403
+IMAGE pandora_0.0.1-200621
+FROM alpine3.10-python3.7_3.7.5-200621
 # Django required by Pandora requires psycopg<=2.7.7 which does not compile under python3.8
 
 RUN EOF
diff --git a/lxc-apps/safire/app b/lxc-apps/safire/app
index 66f6645..d4044f6 100644
--- a/lxc-apps/safire/app
+++ b/lxc-apps/safire/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.3-200504",
+    "version": "1.0.3-200621",
     "meta": {
         "title": "Sahana Eden - SAFIRE",
         "desc-cs": "Řízení humanítární činnosti - Řešení nouzových událostí",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "safire": {
-            "image": "sahana_1.0.3-200504",
+            "image": "sahana_1.0.3-200621",
             "depends": [
                 "safire-postgres"
             ],
@@ -23,7 +23,7 @@
             }
         },
         "safire-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "safire/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/safire/install.sh b/lxc-apps/safire/install.sh
index 23c1547..f3ef5c8 100755
--- a/lxc-apps/safire/install.sh
+++ b/lxc-apps/safire/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/safire/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/safire/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/safire/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200504"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sahana-demo/app b/lxc-apps/sahana-demo/app
index 9b02f75..f5654c3 100644
--- a/lxc-apps/sahana-demo/app
+++ b/lxc-apps/sahana-demo/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.3-200504",
+    "version": "1.0.3-200621",
     "meta": {
         "title": "Sahana Eden - Demo",
         "desc-cs": "Řízení humanítární činnosti - Demo instance",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sahana-demo": {
-            "image": "sahana_1.0.3-200504",
+            "image": "sahana_1.0.3-200621",
             "depends": [
                 "sahana-demo-postgres"
             ],
@@ -22,7 +22,7 @@
             }
         },
         "sahana-demo-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "sahana-demo/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/sahana-demo/install.sh b/lxc-apps/sahana-demo/install.sh
index 6a0c22b..505a381 100755
--- a/lxc-apps/sahana-demo/install.sh
+++ b/lxc-apps/sahana-demo/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana-demo/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200504"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sahana/app b/lxc-apps/sahana/app
index c4130cf..06100fc 100644
--- a/lxc-apps/sahana/app
+++ b/lxc-apps/sahana/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.3-200504",
+    "version": "1.0.3-200621",
     "meta": {
         "title": "Sahana Eden",
         "desc-cs": "Řízení humanítární činnosti",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sahana": {
-            "image": "sahana_1.0.3-200504",
+            "image": "sahana_1.0.3-200621",
             "depends": [
                 "sahana-postgres"
             ],
@@ -22,7 +22,7 @@
             }
         },
         "sahana-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "sahana/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/sahana/image b/lxc-apps/sahana/image
index ea1116b..9691090 100644
--- a/lxc-apps/sahana/image
+++ b/lxc-apps/sahana/image
@@ -1,5 +1,5 @@
-IMAGE sahana_1.0.3-200504
-FROM alpine3.11-python3.8_3.8.2-200403
+IMAGE sahana_1.0.3-200621
+FROM alpine3.11-python3.8_3.8.2-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/sahana/install.sh b/lxc-apps/sahana/install.sh
index ab48806..d599c16 100755
--- a/lxc-apps/sahana/install.sh
+++ b/lxc-apps/sahana/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200504"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sambro/app b/lxc-apps/sambro/app
index fff7756..0a67852 100644
--- a/lxc-apps/sambro/app
+++ b/lxc-apps/sambro/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.3-200504",
+    "version": "1.0.3-200621",
     "meta": {
         "title": "Sahana Eden - SAMBRO",
         "desc-cs": "Řízení humanítární činnosti - Centrum hlášení a výstrah",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sambro": {
-            "image": "sahana_1.0.3-200504",
+            "image": "sahana_1.0.3-200621",
             "depends": [
                 "sambro-postgres"
             ],
@@ -23,7 +23,7 @@
             }
         },
         "sambro-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "sambro/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh
index a0e90ab..0187a9d 100755
--- a/lxc-apps/sambro/install.sh
+++ b/lxc-apps/sambro/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200504"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/seeddms/app b/lxc-apps/seeddms/app
index 464a02a..9a0912c 100644
--- a/lxc-apps/seeddms/app
+++ b/lxc-apps/seeddms/app
@@ -1,5 +1,5 @@
 {
-    "version": "5.1.15-200403",
+    "version": "5.1.15-200621",
     "meta": {
         "title": "SeedDMS",
         "desc-cs": "Archiv dokumentace",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "seeddms": {
-            "image": "seeddms_5.1.15-200403",
+            "image": "seeddms_5.1.15-200621",
             "depends": [
                 "seeddms-postgres"
             ],
@@ -18,7 +18,7 @@
             }
         },
         "seeddms-postgres": {
-            "image": "postgres_12.2.0-200403",
+            "image": "postgres_12.2.0-200621",
             "mounts": {
                 "seeddms/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/seeddms/image b/lxc-apps/seeddms/image
index f4b16ea..7db68d5 100644
--- a/lxc-apps/seeddms/image
+++ b/lxc-apps/seeddms/image
@@ -1,5 +1,5 @@
-IMAGE seeddms_5.1.15-200403
-FROM alpine3.11-php7.3_7.3.16-200403
+IMAGE seeddms_5.1.15-200621
+FROM alpine3.11-php7.3_7.3.16-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/seeddms/install.sh b/lxc-apps/seeddms/install.sh
index 73c2a55..52a060d 100755
--- a/lxc-apps/seeddms/install.sh
+++ b/lxc-apps/seeddms/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/seeddms/postgres_data"
 SEEDDMS_DATA="${VOLUMES_DIR}/seeddms/seeddms_data"
 SEEDDMS_CONF="${VOLUMES_DIR}/seeddms/seeddms_conf"
-SEEDDMS_LAYER="${LAYERS_DIR}/seeddms_5.1.15-200403"
+SEEDDMS_LAYER="${LAYERS_DIR}/seeddms_5.1.15-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/share/app b/lxc-apps/share/app
index f92027b..24d5c40 100644
--- a/lxc-apps/share/app
+++ b/lxc-apps/share/app
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.3-200504",
+    "version": "1.0.3-200621",
     "meta": {
         "title": "Sahana Eden - SHARE",
         "desc-cs": "Řízení humanítární činnosti - Úleva a rehabilitace",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "share": {
-            "image": "sahana_1.0.3-200504",
+            "image": "sahana_1.0.3-200621",
             "depends": [
                 "share-postgres"
             ],
@@ -23,7 +23,7 @@
             }
         },
         "share-postgres": {
-            "image": "postgis_3.0.0-200403",
+            "image": "postgis_3.0.0-200621",
             "mounts": {
                 "share/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/share/install.sh b/lxc-apps/share/install.sh
index 0672293..9d3ff56 100755
--- a/lxc-apps/share/install.sh
+++ b/lxc-apps/share/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/share/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/share/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/share/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200504"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_1.0.3-200621"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/ushahidi/app b/lxc-apps/ushahidi/app
index 1d25807..9b7d0dc 100644
--- a/lxc-apps/ushahidi/app
+++ b/lxc-apps/ushahidi/app
@@ -1,5 +1,5 @@
 {
-    "version": "4.4.2-200403",
+    "version": "4.4.2-200621",
     "meta": {
         "title": "Ushahidi",
         "desc-cs": "Skupinová reakce na události",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "ushahidi": {
-            "image": "ushahidi_4.4.2-200403",
+            "image": "ushahidi_4.4.2-200621",
             "depends": [
                 "ushahidi-redis",
                 "ushahidi-mariadb"
@@ -20,14 +20,14 @@
             }
         },
         "ushahidi-redis": {
-            "image": "redis_5.0.7-200403",
+            "image": "redis_5.0.7-200621",
             "mounts": {
                 "ushahidi/redis_conf/redis.conf": "etc/redis.conf:file",
                 "ushahidi/redis_data": "var/lib/redis"
             }
         },
         "ushahidi-mariadb": {
-            "image": "mariadb_10.4.12-200403",
+            "image": "mariadb_10.4.12-200621",
             "mounts": {
                 "ushahidi/mariadb_conf/my.cnf": "etc/my.cnf:file",
                 "ushahidi/mariadb_data": "var/lib/mysql"
diff --git a/lxc-apps/ushahidi/image b/lxc-apps/ushahidi/image
index b3a5b84..ceb1d11 100644
--- a/lxc-apps/ushahidi/image
+++ b/lxc-apps/ushahidi/image
@@ -1,5 +1,5 @@
-IMAGE ushahidi_4.4.2-200403
-FROM alpine3.11-php7.3_7.3.16-200403
+IMAGE ushahidi_4.4.2-200621
+FROM alpine3.11-php7.3_7.3.16-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-services/activemq/image b/lxc-services/activemq/image
index 9ebdb31..4227d16 100644
--- a/lxc-services/activemq/image
+++ b/lxc-services/activemq/image
@@ -1,5 +1,5 @@
-IMAGE activemq_5.15.9-200403
-FROM alpine3.11-java8_8.242.08-200403
+IMAGE activemq_5.15.9-200621
+FROM alpine3.11-java8_8.242.08-200621
 
 RUN EOF
     # Download and install ActiveMQ
diff --git a/lxc-services/mariadb/image b/lxc-services/mariadb/image
index cce7ccc..b99ee8c 100644
--- a/lxc-services/mariadb/image
+++ b/lxc-services/mariadb/image
@@ -1,4 +1,4 @@
-IMAGE mariadb_10.4.12-200403
+IMAGE mariadb_10.4.12-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image
index 0ab2e1a..33899b6 100644
--- a/lxc-services/postgis/image
+++ b/lxc-services/postgis/image
@@ -1,5 +1,5 @@
-IMAGE postgis_3.0.0-200403
-FROM postgres_12.2.0-200403
+IMAGE postgis_3.0.0-200621
+FROM postgres_12.2.0-200621
 
 USER root
 
diff --git a/lxc-services/postgres/image b/lxc-services/postgres/image
index 0a2b9d5..73654c0 100644
--- a/lxc-services/postgres/image
+++ b/lxc-services/postgres/image
@@ -1,4 +1,4 @@
-IMAGE postgres_12.2.0-200403
+IMAGE postgres_12.2.0-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-services/rabbitmq/image b/lxc-services/rabbitmq/image
index b18946d..7438ab0 100644
--- a/lxc-services/rabbitmq/image
+++ b/lxc-services/rabbitmq/image
@@ -1,4 +1,4 @@
-IMAGE rabbitmq_3.7.18-200403
+IMAGE rabbitmq_3.7.18-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-services/redis/image b/lxc-services/redis/image
index d33979c..d9651a8 100644
--- a/lxc-services/redis/image
+++ b/lxc-services/redis/image
@@ -1,4 +1,4 @@
-IMAGE redis_5.0.7-200403
+IMAGE redis_5.0.7-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-services/solr6/image b/lxc-services/solr6/image
index 8d86dfd..454a28d 100644
--- a/lxc-services/solr6/image
+++ b/lxc-services/solr6/image
@@ -1,5 +1,5 @@
-IMAGE solr6_6.5.1-200403
-FROM alpine3.11-java8_8.242.08-200403
+IMAGE solr6_6.5.1-200621
+FROM alpine3.11-java8_8.242.08-200621
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-shared/alpine3.10-nodejs10/image b/lxc-shared/alpine3.10-nodejs10/image
index 32f36e0..b915602 100644
--- a/lxc-shared/alpine3.10-nodejs10/image
+++ b/lxc-shared/alpine3.10-nodejs10/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.10-nodejs10_10.19.0-200403
+IMAGE alpine3.10-nodejs10_10.19.0-200621
 FROM alpine3.10_3.10.5-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.10-python2.7/image b/lxc-shared/alpine3.10-python2.7/image
index 5cb3c31..4439c8d 100644
--- a/lxc-shared/alpine3.10-python2.7/image
+++ b/lxc-shared/alpine3.10-python2.7/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.10-python2.7_2.7.16-200403
+IMAGE alpine3.10-python2.7_2.7.16-200621
 FROM alpine3.10_3.10.5-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.10-python3.7/image b/lxc-shared/alpine3.10-python3.7/image
index d335dcc..0b8717c 100644
--- a/lxc-shared/alpine3.10-python3.7/image
+++ b/lxc-shared/alpine3.10-python3.7/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.10-python3.7_3.7.5-200403
+IMAGE alpine3.10-python3.7_3.7.5-200621
 FROM alpine3.10_3.10.5-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-java8/image b/lxc-shared/alpine3.11-java8/image
index 4717e66..b503d7d 100644
--- a/lxc-shared/alpine3.11-java8/image
+++ b/lxc-shared/alpine3.11-java8/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-java8_8.242.08-200403
+IMAGE alpine3.11-java8_8.242.08-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-php7.3/image b/lxc-shared/alpine3.11-php7.3/image
index 5346c3b..130788a 100644
--- a/lxc-shared/alpine3.11-php7.3/image
+++ b/lxc-shared/alpine3.11-php7.3/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-php7.3_7.3.16-200403
+IMAGE alpine3.11-php7.3_7.3.16-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-python2.7/image b/lxc-shared/alpine3.11-python2.7/image
index 32d7a39..256c18b 100644
--- a/lxc-shared/alpine3.11-python2.7/image
+++ b/lxc-shared/alpine3.11-python2.7/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-python2.7_2.7.16-200403
+IMAGE alpine3.11-python2.7_2.7.16-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-python3.8/image b/lxc-shared/alpine3.11-python3.8/image
index 265fb6d..a5f54bf 100644
--- a/lxc-shared/alpine3.11-python3.8/image
+++ b/lxc-shared/alpine3.11-python3.8/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-python3.8_3.8.2-200403
+IMAGE alpine3.11-python3.8_3.8.2-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-ruby2.4/image b/lxc-shared/alpine3.11-ruby2.4/image
index 48f07d0..8589581 100644
--- a/lxc-shared/alpine3.11-ruby2.4/image
+++ b/lxc-shared/alpine3.11-ruby2.4/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-ruby2.4_2.4.9-200403
+IMAGE alpine3.11-ruby2.4_2.4.9-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-ruby2.6/image b/lxc-shared/alpine3.11-ruby2.6/image
index 5d8b2f1..4a23495 100644
--- a/lxc-shared/alpine3.11-ruby2.6/image
+++ b/lxc-shared/alpine3.11-ruby2.6/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.11-ruby2.6_2.6.5-200403
+IMAGE alpine3.11-ruby2.6_2.6.5-200621
 FROM alpine3.11_3.11.6-200621
 
 RUN EOF
diff --git a/lxc-shared/alpine3.11-tomcat7/image b/lxc-shared/alpine3.11-tomcat7/image
index 580c71c..88334a2 100644
--- a/lxc-shared/alpine3.11-tomcat7/image
+++ b/lxc-shared/alpine3.11-tomcat7/image
@@ -1,5 +1,5 @@
-IMAGE alpine3.11-tomcat7_7.0.103-200403
-FROM alpine3.11-java8_8.242.08-200403
+IMAGE alpine3.11-tomcat7_7.0.103-200621
+FROM alpine3.11-java8_8.242.08-200621
 
 RUN EOF
     # Install Tomcat 7
diff --git a/lxc-shared/alpine3.11-tomcat8.5/image b/lxc-shared/alpine3.11-tomcat8.5/image
index 78a020d..44c6823 100644
--- a/lxc-shared/alpine3.11-tomcat8.5/image
+++ b/lxc-shared/alpine3.11-tomcat8.5/image
@@ -1,5 +1,5 @@
-IMAGE alpine3.11-tomcat8.5_8.5.53-200403
-FROM alpine3.11-java8_8.242.08-200403
+IMAGE alpine3.11-tomcat8.5_8.5.53-200621
+FROM alpine3.11-java8_8.242.08-200621
 
 RUN EOF
     # Install Tomcat 8.5
diff --git a/lxc-shared/alpine3.8-java8/image b/lxc-shared/alpine3.8-java8/image
index 3b8e56d..42ea2a6 100644
--- a/lxc-shared/alpine3.8-java8/image
+++ b/lxc-shared/alpine3.8-java8/image
@@ -1,5 +1,5 @@
-IMAGE alpine3.8-java8_8.222.10-200403
-FROM alpine3.8_3.8.5-200403
+IMAGE alpine3.8-java8_8.222.10-200621
+FROM alpine3.8_3.8.5-200621
 
 RUN EOF
     apk --no-cache add openjdk8-jre-base
diff --git a/lxc-shared/alpine3.8-ruby2.4/image b/lxc-shared/alpine3.8-ruby2.4/image
index a07eff2..0717e95 100644
--- a/lxc-shared/alpine3.8-ruby2.4/image
+++ b/lxc-shared/alpine3.8-ruby2.4/image
@@ -1,5 +1,5 @@
-IMAGE alpine3.8-ruby2.4_2.4.9-200403
-FROM alpine3.8_3.8.5-200403
+IMAGE alpine3.8-ruby2.4_2.4.9-200621
+FROM alpine3.8_3.8.5-200621
 
 RUN EOF
     # Install Ruby runtime dependencies
diff --git a/lxc-shared/alpine3.8/image b/lxc-shared/alpine3.8/image
index 0fef842..32f3e28 100644
--- a/lxc-shared/alpine3.8/image
+++ b/lxc-shared/alpine3.8/image
@@ -1,4 +1,4 @@
-IMAGE alpine3.8_3.8.5-200403
+IMAGE alpine3.8_3.8.5-200621
 
 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.8/x86_64/alpine-minirootfs-3.8.5-x86_64.tar.gz