diff --git a/.github/workflows/build-onvif-video-broker-container.yml b/.github/workflows/build-onvif-video-broker-container.yml
index 6b3e66947..649a6b5dd 100644
--- a/.github/workflows/build-onvif-video-broker-container.yml
+++ b/.github/workflows/build-onvif-video-broker-container.yml
@@ -49,11 +49,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Build and push
       run: |
diff --git a/.github/workflows/build-opcua-monitoring-broker-container.yml b/.github/workflows/build-opcua-monitoring-broker-container.yml
index f2c15cd1a..a087f6257 100644
--- a/.github/workflows/build-opcua-monitoring-broker-container.yml
+++ b/.github/workflows/build-opcua-monitoring-broker-container.yml
@@ -42,11 +42,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-opencv-base-container.yml b/.github/workflows/build-opencv-base-container.yml
index dd7724efe..feffc9892 100644
--- a/.github/workflows/build-opencv-base-container.yml
+++ b/.github/workflows/build-opencv-base-container.yml
@@ -57,11 +57,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-python-app-containers.yml b/.github/workflows/build-python-app-containers.yml
index b67b5cf94..545e305d9 100644
--- a/.github/workflows/build-python-app-containers.yml
+++ b/.github/workflows/build-python-app-containers.yml
@@ -4,14 +4,14 @@ on:
   push:
     branches: [ main ]
     paths:
-    - .github/workflows/build-python-app-container.yml
+    - .github/workflows/build-python-app-containers.yml
     - build/containers/Dockerfile.python-app
     - samples/apps/**
     - version.txt
   pull_request:
     branches: [ main ]
     paths:
-    - .github/workflows/build-python-app-container.yml
+    - .github/workflows/build-python-app-containers.yml
     - build/containers/Dockerfile.python-app
     - samples/apps/**
     - version.txt
@@ -47,11 +47,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
diff --git a/.github/workflows/build-rust-containers.yml b/.github/workflows/build-rust-containers.yml
index 30cb77bdd..00c3108d6 100644
--- a/.github/workflows/build-rust-containers.yml
+++ b/.github/workflows/build-rust-containers.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-    - .github/workflows/build-rust-code.yml
+    - .github/workflows/build-rust-containers.yml
     - build/containers/Dockerfile.rust
     - '**.rs'
     - '**/Cargo.toml'
@@ -13,7 +13,7 @@ on:
   pull_request:
     branches: [ main ]
     paths:
-    - .github/workflows/build-rust-code.yml
+    - .github/workflows/build-rust-containers.yml
     - build/containers/Dockerfile.rust
     - '**.rs'
     - '**/Cargo.toml'
@@ -60,11 +60,12 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: github.event_name == 'push' || github.event_name == 'release'
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
 
     - name: Docker meta
       uses: docker/metadata-action@v5
@@ -138,6 +139,13 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ secrets.crUsername }}
+        password: ${{ secrets.crPassword }}
+
     - name: Docker meta
       uses: docker/metadata-action@v5
       id: meta