diff --git a/build-pipeline-yocto.yml.jinja2 b/build-pipeline-yocto.yml.jinja2
index 94ea1cc5a5dd5a0e6a92ea93f161285c896dc9b9..68279340b9abbc0748d361858a18bdb4706ba605 100644
--- a/build-pipeline-yocto.yml.jinja2
+++ b/build-pipeline-yocto.yml.jinja2
@@ -185,10 +185,6 @@ import-alphaplan-data-{{ machine }}:
 # --------------------------------------------------------------------------------------
 # Stage: Deploy FTP
 # --------------------------------------------------------------------------------------
-# FIXME: This is a workaround to prevent customer releases being uploaded to our
-# public FTP area. It should be removed as soon as we support uploading to different
-# FTP target folders.
-{% if HIDE_FTP_UPLOAD_STAGE is not defined or not HIDE_FTP_UPLOAD_STAGE %}
 {% if SIMULATE_BUILD is defined and SIMULATE_BUILD == "true"
    or CI_COMMIT_TAG is defined %}
 
@@ -197,6 +193,10 @@ ftp-{{ machine }}:
   stage: Deploy FTP
   tags:
     - ftp
+  rules:
+    - if: $DEPLOY_FTP_TARGET
+      when: manual
+      allow_failure: true
   variables:
     MACHINE: {{ machine }}
     DEPLOY_SOURCE: ${RELEASE_NAME}
@@ -210,7 +210,6 @@ ftp-{{ machine }}:
     - job: build-version
 
 {% endif %}
-{% endif %}
 
 
 # --------------------------------------------------------------------------------------
@@ -250,7 +249,6 @@ azure-{{ machine }}:
 # --------------------------------------------------------------------------------------
 # Stage: Confluence
 # --------------------------------------------------------------------------------------
-{% if HIDE_FTP_UPLOAD_STAGE is not defined or not HIDE_FTP_UPLOAD_STAGE %}
 {% if SIMULATE_BUILD is defined and SIMULATE_BUILD == "true"
    or CI_COMMIT_TAG is defined %}
 
@@ -265,6 +263,5 @@ publish-confluence-page:
     - .publish-confluence-page
 
 {% endif %}
-{% endif %}
 
 {% endif %} # if MACHINES