diff --git a/ipatests/azure/Dockerfile.build-container b/ipatests/azure/Dockerfile.build-container
index 3ff11aed0..105b60c51 100644
--- a/ipatests/azure/Dockerfile.build-container
+++ b/ipatests/azure/Dockerfile.build-container
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:31
 MAINTAINER [FreeIPA Developers freeipa-devel@lists.fedorahosted.org]
 ENV container=docker LANG=en_US.utf8 LANGUAGE=en_US.utf8 LC_ALL=en_US.utf8
 
diff --git a/ipatests/azure/azure-pipelines.yml b/ipatests/azure/azure-pipelines.yml
index 289e1887b..3ae6f46ea 100644
--- a/ipatests/azure/azure-pipelines.yml
+++ b/ipatests/azure/azure-pipelines.yml
@@ -11,7 +11,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   container:
-    image: registry.fedoraproject.org/f30/fedora-toolbox
+    image: registry.fedoraproject.org/f31/fedora-toolbox
     options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged
   steps:
     - template: templates/prepare-build.yml
@@ -29,7 +29,7 @@ jobs:
     - script: |
         set -e
         echo "Running make target 'rpms'"
-        make V=0 rpms LOG_COMPILE='gdb -return-child-result -ex run -ex "thread apply all bt" -ex "quit" --args'
+        make V=0 rpms LOG_COMPILE='gdb.minimal -return-child-result -ex run -ex "thread apply all bt" -ex "quit" --args'
       displayName: Build packages
     - script: |
         set -e
@@ -46,7 +46,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   container:
-    image: registry.fedoraproject.org/f30/fedora-toolbox
+    image: registry.fedoraproject.org/f31/fedora-toolbox
     options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged
   steps:
     - template: templates/prepare-build.yml
@@ -65,7 +65,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   container:
-    image: registry.fedoraproject.org/f30/fedora-toolbox
+    image: registry.fedoraproject.org/f31/fedora-toolbox
     options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged
   steps:
     - template: templates/prepare-build.yml
@@ -96,7 +96,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu-16.04'
   container:
-    image: registry.fedoraproject.org/f30/fedora-toolbox
+    image: registry.fedoraproject.org/f31/fedora-toolbox
     options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged
   steps:
     - template: templates/prepare-build.yml
diff --git a/ipatests/azure/templates/prepare-build.yml b/ipatests/azure/templates/prepare-build.yml
index d3c3df25d..0528efe12 100644
--- a/ipatests/azure/templates/prepare-build.yml
+++ b/ipatests/azure/templates/prepare-build.yml
@@ -13,10 +13,20 @@ steps:
     for metalink in $(sudo dnf repolist -v |grep Repo-metalink | awk '{print $2}' ) ; do echo '###############' ; echo '####' ; echo $metalink ; echo '####' ; curl $metalink ; done
     echo "Fastestmirror results:"
     sudo cat /var/cache/dnf/fastestmirror.cache
-    sudo dnf -y module enable nodejs:12
     sudo dnf makecache || :
     echo "Installing base development environment"
-    sudo dnf install -y gdb make autoconf rpm-build gettext-devel automake libtool docker python3-paramiko python3-pyyaml
+    sudo dnf install -y \
+        gdb-minimal \
+        make \
+        autoconf \
+        rpm-build \
+        gettext-devel \
+        automake \
+        libtool \
+        docker \
+        python3-paramiko \
+        python3-pyyaml \
+
     echo "Installing FreeIPA development dependencies"
     sudo dnf builddep -y --skip-broken -D "with_wheels 1" -D "with_lint 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False
   displayName: Prepare build environment