diff --git a/defaults/main.yml b/defaults/main.yml
index 2f669157..8701160f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -254,5 +254,9 @@ roles_upgrade_order: '__undefined__'
 # Packet loss threshold for a ping test
 loss_threshold: 1
 
+# Run leapp upgrade without RHSM subscription
+# Requires workarounds being applied.
+leapp_unsubscribed: false
+
 # Leapp OS upgrade variables
 leapp_unregister: true
diff --git a/tasks/upgrade/undercloud_os_upgrade.yaml b/tasks/upgrade/undercloud_os_upgrade.yaml
index c1b0daeb..30755819 100644
--- a/tasks/upgrade/undercloud_os_upgrade.yaml
+++ b/tasks/upgrade/undercloud_os_upgrade.yaml
@@ -41,7 +41,7 @@
 - name: Run leapp upgrade (download packages)
   shell: |
     set -o pipefail
-    leapp upgrade --debug 2>&1 | \
+    {{ 'LEAPP_DEVEL_SKIP_RHSM=1 sudo -E' if leapp_unsubscribed|bool and upgrade_workarounds|bool }} leapp upgrade --debug 2>&1 | \
         tee {{ working_dir }}/undercloud_leapp_upgrade.log
 
 - name: Reboot the undercloud
@@ -50,4 +50,6 @@
 - name: Unregister the node once the OS was upgraded if desired
   redhat_subscription:
     state: absent
-  when: leapp_unregister|bool
+  when:
+    - leapp_unregister|bool
+    - not leapp_unsubscribed|bool