diff --git a/inventory/host_vars/jenkins.fedorainfracloud.org b/inventory/host_vars/jenkins.fedorainfracloud.org
index 43831bff31..12e9811747 100644
--- a/inventory/host_vars/jenkins.fedorainfracloud.org
+++ b/inventory/host_vars/jenkins.fedorainfracloud.org
@@ -18,3 +18,10 @@ cloud_networks:
   - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
 
 jenkins_master: True
+
+tcp_ports: [ 80 ]
+
+custom_rules: [
+    # Redirect port 80 to 8080, which is used by jenkins
+    '-A PREROUTING -t nat -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080',
+ ]
diff --git a/roles/jenkins/master/files/jenkins.conf b/roles/jenkins/master/files/jenkins.conf
index f795384e54..40e2f47d7e 100644
--- a/roles/jenkins/master/files/jenkins.conf
+++ b/roles/jenkins/master/files/jenkins.conf
@@ -65,7 +65,7 @@ JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
 # Port Jenkins is listening on.
 # Set to -1 to disable
 #
-JENKINS_PORT="80"
+JENKINS_PORT="8080"
 
 ## Type:        integer(0:65535)
 ## Default:     8009
diff --git a/roles/jenkins/master/tasks/main.yml b/roles/jenkins/master/tasks/main.yml
index 52d888b9ea..186525c384 100644
--- a/roles/jenkins/master/tasks/main.yml
+++ b/roles/jenkins/master/tasks/main.yml
@@ -2,6 +2,9 @@
   dnf: name={{ item }} state=installed
   with_items:
   - jenkins
+  # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1236210
+  # FIXME: remove when not needed any longer
+  - unzip
   tags:
   - jenkins
   - jenkins/master