diff --git a/build-pipeline.yml b/build-pipeline.yml
index aa7e2b94407d2adb1d7a95efa9fdd352bd998e32..451a187c9cedeee3c150a2b33906c50dd68aaab7 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -127,7 +127,8 @@ workflow:
   - echo "DISTRO_RELEASE_ARTEFACTS='${DISTRO_RELEASE_ARTEFACTS}'" >> build.env
   # Install script location is needed in test job
   - echo "FNG_INSTALL_URL=${FNG_INSTALL_URL}" >> build.env
-  # Supported hardware is needed for Confluence release page
+  # Machine and supported hardware are needed for Confluence release page
+  - echo "MACHINE=${MACHINE}" >> build.env
   - echo "SUPPORTED_HARDWARE='${SUPPORTED_HARDWARE}'" >> build.env
 
 # --------------------------------------------------------------------------------------
@@ -414,10 +415,7 @@ workflow:
     - when: manual
       allow_failure: true
   after_script:
-    # Save MACHINE for confluence stage. This variable cannot be passed directly on the
-    # job definition level because the confluence stage is machine-independent.
-    - echo "MACHINE=${MACHINE}" > deploy.env
-    - echo "FILES=\"$(cat files.txt | tr '\n' ' ')\"" >> deploy.env
+    - echo "FILES=\"$(cat files.txt | tr '\n' ' ')\"" > deploy.env
   timeout: 60m
   cache:
     # Get the packaged artifacts from the cache