diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 8c8f5a4..940ce02 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -28,7 +28,8 @@ jobs:
           if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
             echo "tag=latest" >> $GITHUB_OUTPUT
           else
-            echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+            # renovate creates sub branches with `/`; these break the tagging in the build process
+            echo tag=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/_/g') >> $GITHUB_OUTPUT
           fi
 
       - name: Build web image
diff --git a/docker-compose.yml b/docker-compose.yml
index 438e645..4509256 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,8 +21,8 @@ services:
     environment:
       MYSQL_HOST: db
       MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
-      MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
-      MYSQL_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
+      CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
+      CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
       DEFAULT_ZOOM: 12
       DEFAULT_LAT: 0
       DEFAULT_LON: 0
diff --git a/web/www/sunders/config.php b/web/www/sunders/config.php
index 3050d6c..e39b407 100644
--- a/web/www/sunders/config.php
+++ b/web/www/sunders/config.php
@@ -9,8 +9,8 @@
 
     define('MYSQL_HOST', getenv('MYSQL_HOST') ?: '');
     define('MYSQL_DB', getenv('MYSQL_DB') ?: '');
-    define('MYSQL_USER', getenv('MYSQL_USER') ?: '');
-    define('MYSQL_PASSWORD', getenv('MYSQL_PASSWORD') ?: '');
+    define('MYSQL_USER', getenv('CAMERA_SELECT_USER') ?: '');
+    define('MYSQL_PASSWORD', getenv('CAMERA_SELECT_USER_PASSWORD') ?: '');
 
     define('USE_STATISTICS', false);
 ?>
\ No newline at end of file