diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_coreproject.yaml b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_coreproject.yaml
index 460aa2f65..6a571db78 100644
--- a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_coreproject.yaml
+++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_coreproject.yaml
@@ -20,7 +20,6 @@
           name: arch
           values:
           - x86
-          - armv7
           - armv8
       - axis:
           type: slave
@@ -28,7 +27,7 @@
           values:
           - debian
     execution-strategy:
-      combination-filter: '((onlyarch == "all") || onlyarch == arch) && ((onlyos == "all") || onlyos == os) && !(version != 1.17 && arch == "armv7") && !((version == "1.17" || version == "1.18") && os == "bionic")'
+      combination-filter: '((onlyarch == "all") || onlyarch == arch) && ((onlyos == "all") || onlyos == os)'
     builders:
       - build_deb_coreproject
     publishers:
@@ -59,7 +58,6 @@ Any value other than "theforeman" will be pushed to http://stagingdeb.theforeman
           choices:
             - all
             - x86
-            - armv7
             - armv8
           description: 'Restrict matrix job to just the one arch.'
       - string:
diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_dependency.yaml b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_dependency.yaml
index 5c6093119..bac39f614 100644
--- a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_dependency.yaml
+++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_dependency.yaml
@@ -23,7 +23,6 @@
           name: arch
           values:
           - x86
-          - armv7
           - armv8
       - axis:
           type: slave
diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_push_deb.yaml b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_push_deb.yaml
index e03db9dc0..66586d01f 100644
--- a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_push_deb.yaml
+++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_push_deb.yaml
@@ -19,5 +19,3 @@
           - stretch
           - xenial
           - bionic
-    execution-strategy:
-      combination-filter: '!(os == "bionic" && (major_version == "1.17" || major_version == "1.18"))'
diff --git a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_test.yaml b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_test.yaml
index 2ed47a899..8155c1c5c 100644
--- a/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_test.yaml
+++ b/puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_test.yaml
@@ -34,8 +34,6 @@
           name: label
           values:
             - el&&ipv6
-    execution-strategy:
-      combination-filter: '!(os == "ubuntu1804" && (major_version == "1.17" || major_version == "1.18"))'
     wrappers:
       - abort_build:
           timeout_min: 120