diff --git a/.drone.yml b/.drone.yml
index 753aedc..59061c8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,7 +24,7 @@ steps:
       FLOW_RECOVERY_VERSION: v1
       FLOW_TRANSLATION_VERSION: v1
       SYSTEM_BRAND_VERSION: v1
-      NEXTCLOUD_CONFIG_VERSION: v1
+      NEXTCLOUD_VERSION: v1
       SECRET_SECRET_KEY_VERSION: v1
       SECRET_DB_PASSWORD_VERSION: v1
       SECRET_ADMIN_TOKEN_VERSION: v1
diff --git a/abra.sh b/abra.sh
index db2f5bc..d2d27d4 100644
--- a/abra.sh
+++ b/abra.sh
@@ -5,18 +5,18 @@ export FLOW_INVALIDATION_VERSION=v2
 export FLOW_RECOVERY_VERSION=v2
 export FLOW_TRANSLATION_VERSION=v3
 export SYSTEM_BRAND_VERSION=v4
-export NEXTCLOUD_CONFIG_VERSION=v5
-export WORDPRESS_CONFIG_VERSION=v9
-export MATRIX_CONFIG_VERSION=v5
-export WEKAN_CONFIG_VERSION=v7
-export VIKUNJA_CONFIG_VERSION=v5
-export OUTLINE_CONFIG_VERSION=v6
-export KIMAI_CONFIG_VERSION=v4
-export ZAMMAD_CONFIG_VERSION=v5
-export RALLLY_CONFIG_VERSION=v6
-export HEDGEDOC_CONFIG_VERSION=v5
-export MONITORING_CONFIG_VERSION=v7
-export MILA_CONFIG_VERSION=v3
+export NEXTCLOUD_VERSION=v5
+export WORDPRESS_VERSION=v9
+export MATRIX_VERSION=v5
+export WEKAN_VERSION=v7
+export VIKUNJA_VERSION=v5
+export OUTLINE_VERSION=v6
+export KIMAI_VERSION=v4
+export ZAMMAD_VERSION=v5
+export RALLLY_VERSION=v6
+export HEDGEDOC_VERSION=v5
+export MONITORING_VERSION=v7
+export MILA_VERSION=v3
 export DB_ENTRYPOINT_VERSION=v1
 export PG_BACKUP_VERSION=v2
 export ENTRYPOINT_CSS_VERSION=v1
diff --git a/compose.hedgedoc.yml b/compose.hedgedoc.yml
index 1b66b2f..0e8ade6 100644
--- a/compose.hedgedoc.yml
+++ b/compose.hedgedoc.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   hedgedoc:
-    name: ${STACK_NAME}_hedgedoc_${HEDGEDOC_CONFIG_VERSION}
+    name: ${STACK_NAME}_hedgedoc_${HEDGEDOC_VERSION}
     file: hedgedoc.yaml.tmpl
     template_driver: golang
diff --git a/compose.kimai.yml b/compose.kimai.yml
index b23d251..46afe03 100644
--- a/compose.kimai.yml
+++ b/compose.kimai.yml
@@ -12,6 +12,6 @@ services:
 
 configs:
   kimai:
-    name: ${STACK_NAME}_kimai_${KIMAI_CONFIG_VERSION}
+    name: ${STACK_NAME}_kimai_${KIMAI_VERSION}
     file: kimai.yaml.tmpl
     template_driver: golang
diff --git a/compose.matrix.yml b/compose.matrix.yml
index 5f7923d..06ac3b1 100644
--- a/compose.matrix.yml
+++ b/compose.matrix.yml
@@ -30,6 +30,6 @@ secrets:
 
 configs:
   matrix:
-    name: ${STACK_NAME}_matrix_${MATRIX_CONFIG_VERSION}
+    name: ${STACK_NAME}_matrix_${MATRIX_VERSION}
     file: matrix.yaml.tmpl
     template_driver: golang
diff --git a/compose.mila.yml b/compose.mila.yml
index 3f5b3a5..76154c9 100644
--- a/compose.mila.yml
+++ b/compose.mila.yml
@@ -24,7 +24,7 @@ secrets:
 
 configs:
   mila:
-    name: ${STACK_NAME}_mila_${MILA_CONFIG_VERSION}
+    name: ${STACK_NAME}_mila_${MILA_VERSION}
     file: mila.yaml.tmpl
     template_driver: golang
 
diff --git a/compose.monitoring.yml b/compose.monitoring.yml
index e646bfe..e87d626 100644
--- a/compose.monitoring.yml
+++ b/compose.monitoring.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   monitoring:
-    name: ${STACK_NAME}_monitoring_${MONITORING_CONFIG_VERSION}
+    name: ${STACK_NAME}_monitoring_${MONITORING_VERSION}
     file: monitoring.yaml.tmpl
     template_driver: golang
diff --git a/compose.nextcloud.yml b/compose.nextcloud.yml
index e6389cb..a7de2cb 100644
--- a/compose.nextcloud.yml
+++ b/compose.nextcloud.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   nextcloud:
-    name: ${STACK_NAME}_nextcloud_${NEXTCLOUD_CONFIG_VERSION}
+    name: ${STACK_NAME}_nextcloud_${NEXTCLOUD_VERSION}
     file: nextcloud.yaml.tmpl
     template_driver: golang
diff --git a/compose.outline.yml b/compose.outline.yml
index cc4780d..0911b6e 100644
--- a/compose.outline.yml
+++ b/compose.outline.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   outline:
-    name: ${STACK_NAME}_outline_${OUTLINE_CONFIG_VERSION}
+    name: ${STACK_NAME}_outline_${OUTLINE_VERSION}
     file: outline.yaml.tmpl
     template_driver: golang
diff --git a/compose.rallly.yml b/compose.rallly.yml
index 3b36914..9cfe55f 100644
--- a/compose.rallly.yml
+++ b/compose.rallly.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   rallly:
-    name: ${STACK_NAME}_rallly_${RALLLY_CONFIG_VERSION}
+    name: ${STACK_NAME}_rallly_${RALLLY_VERSION}
     file: rallly.yaml.tmpl
     template_driver: golang
diff --git a/compose.vikunja.yml b/compose.vikunja.yml
index ee84b47..d8a5337 100644
--- a/compose.vikunja.yml
+++ b/compose.vikunja.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   vikunja:
-    name: ${STACK_NAME}_vikunja_${VIKUNJA_CONFIG_VERSION}
+    name: ${STACK_NAME}_vikunja_${VIKUNJA_VERSION}
     file: vikunja.yaml.tmpl
     template_driver: golang
diff --git a/compose.wekan.yml b/compose.wekan.yml
index ea36c89..fab7c74 100644
--- a/compose.wekan.yml
+++ b/compose.wekan.yml
@@ -23,6 +23,6 @@ secrets:
 
 configs:
   wekan:
-    name: ${STACK_NAME}_wekan_${WEKAN_CONFIG_VERSION}
+    name: ${STACK_NAME}_wekan_${WEKAN_VERSION}
     file: wekan.yaml.tmpl
     template_driver: golang
diff --git a/compose.wordpress.yml b/compose.wordpress.yml
index 7c41c43..a73b9f1 100644
--- a/compose.wordpress.yml
+++ b/compose.wordpress.yml
@@ -24,6 +24,6 @@ secrets:
 
 configs:
   wordpress:
-    name: ${STACK_NAME}_wordpress_${WORDPRESS_CONFIG_VERSION}
+    name: ${STACK_NAME}_wordpress_${WORDPRESS_VERSION}
     file: wordpress.yaml.tmpl
     template_driver: golang
diff --git a/compose.zammad.yml b/compose.zammad.yml
index f4bc1e4..e7fc95d 100644
--- a/compose.zammad.yml
+++ b/compose.zammad.yml
@@ -11,6 +11,6 @@ services:
 
 configs:
   zammad:
-    name: ${STACK_NAME}_zammad_${ZAMMAD_CONFIG_VERSION}
+    name: ${STACK_NAME}_zammad_${ZAMMAD_VERSION}
     file: zammad.yaml.tmpl
     template_driver: golang