diff --git a/.github/workflows/docker-build-releases.yaml b/.github/workflows/docker-build-releases.yaml
index 6fe5c7e3..b39f4b0e 100644
--- a/.github/workflows/docker-build-releases.yaml
+++ b/.github/workflows/docker-build-releases.yaml
@@ -19,13 +19,15 @@ jobs:
         with:
           fetch-depth: 0
           
-      - name: Set SHAIRPORT_SYNC_BRANCH & NQPTP env.
+      - name: Set SHAIRPORT_SYNC_BRANCH env.
         run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
-      - if: env.SHAIRPORT_SYNC_BRANCH == 'development'
+      - name: Determine NQPTP env (part 1).
+        if: env.SHAIRPORT_SYNC_BRANCH == 'development'
         run: echo "NQPTP_BRANCH=development"
       
-      - if: env.SHAIRPORT_SYNC_BRANCH != 'development'
+      - name: Determine NQPTP env (part 2).
+        if: env.SHAIRPORT_SYNC_BRANCH != 'development'
         run: echo "NQPTP_BRANCH=master"
 
       - name: Set up QEMU
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index d40636a0..9e95cd0d 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -17,13 +17,15 @@ jobs:
         with:
           fetch-depth: 0
           
-      - name: Set SHAIRPORT_SYNC_BRANCH & NQPTP env.
+      - name: Set SHAIRPORT_SYNC_BRANCH env.
         run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
-      - if: env.SHAIRPORT_SYNC_BRANCH == 'development'
+      - name: Determine NQPTP env (part 1).
+        if: env.SHAIRPORT_SYNC_BRANCH == 'development'
         run: echo "NQPTP_BRANCH=development"
       
-      - if: env.SHAIRPORT_SYNC_BRANCH != 'development'
+      - name: Determine NQPTP env (part 2).
+        if: env.SHAIRPORT_SYNC_BRANCH != 'development'
         run: echo "NQPTP_BRANCH=master"
 
       - name: Set up QEMU