diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 98e767d87a5..b7955c84a1d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -680,9 +680,6 @@ jobs:
 
 - job: BuildYumPackage
   displayName: Build Yum Package
-
-  dependsOn: BuildPythonWheel
-  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
   pool:
     vmImage: 'ubuntu-20.04'
   steps:
diff --git a/scripts/release/rpm/azure-cli.spec b/scripts/release/rpm/azure-cli.spec
index e183409a677..9cda03dd4e3 100644
--- a/scripts/release/rpm/azure-cli.spec
+++ b/scripts/release/rpm/azure-cli.spec
@@ -43,9 +43,12 @@ A great cloud needs great tools; we're excited to introduce Azure CLI,
 # Create a fully instantiated virtual environment, ready to use the CLI.
 %{python_cmd} -m venv %{buildroot}%{cli_lib_dir}
 source %{buildroot}%{cli_lib_dir}/bin/activate
-%{python_cmd} -m pip install --upgrade pip==21.0.1
+%{python_cmd} -m pip install --upgrade pip
 source %{repo_path}/scripts/install_full.sh
 
+# cffi 1.15.0 doesn't work with RPM: https://foss.heptapod.net/pypy/cffi/-/issues/513
+%{python_cmd} -m pip install cffi==1.14.6
+
 deactivate
 
 # Fix up %{buildroot} appearing in some files...