diff --git a/bots/images/debian-stable b/bots/images/debian-stable
index a5e2212c24cd..c74bf71edfc2 120000
--- a/bots/images/debian-stable
+++ b/bots/images/debian-stable
@@ -1 +1 @@
-debian-stable-2865957f1ffc70cd7ebdd4fc7651f2314a19736493af7b1c6e8a909d1403a066.qcow2
\ No newline at end of file
+debian-stable-96ee6404b8b20122ad4639d4f71e6fd915fe5dfa4b8a9d4b3838276f1668c47b.qcow2
\ No newline at end of file
diff --git a/bots/images/debian-testing b/bots/images/debian-testing
index 361b2ce311e2..b1512332156a 120000
--- a/bots/images/debian-testing
+++ b/bots/images/debian-testing
@@ -1 +1 @@
-debian-testing-6522ec67f4e558ad8ef273d802626f292f2448e41ec6cd5ceece25304845328c.qcow2
\ No newline at end of file
+debian-testing-7aa1424158e8521dce5f23f197b32bdd193a7408e50704af3a5d3699c3785d04.qcow2
\ No newline at end of file
diff --git a/bots/images/scripts/debian.setup b/bots/images/scripts/debian.setup
index 6f307e1f3254..c9baeb29fe57 100755
--- a/bots/images/scripts/debian.setup
+++ b/bots/images/scripts/debian.setup
@@ -69,9 +69,6 @@ case "$RELEASE" in
         ;;
 
     testing)
-        # https://tracker.debian.org/pcp not currently in testing
-        COCKPIT_DEPS="${COCKPIT_DEPS/libpcp3 /}"
-        COCKPIT_DEPS="${COCKPIT_DEPS/pcp /}"
         COCKPIT_DEPS="${COCKPIT_DEPS} libblockdev-mdraid2 udisks2-lvm2"
 
         # docker.io got removed from testing; use backports-version
@@ -137,12 +134,6 @@ systemctl disable apt-daily.service apt-daily.timer || true
 echo "kernel.core_pattern=|/lib/systemd/systemd-coredump %P %u %g %s %t %c %e" > /etc/sysctl.d/50-coredump.conf
 printf 'DefaultLimitCORE=infinity\n' >> /etc/systemd/system.conf
 
-# HACK: docker fails without /etc/resolv.conf
-# https://bugzilla.redhat.com/show_bug.cgi?id=1448331
-mkdir -p /etc/systemd/system/docker.service.d
-printf "[Service]\nExecStartPre=/bin/sh -c 'echo -n >> /etc/resolv.conf'\n" > /etc/systemd/system/docker.service.d/resolv.conf
-systemctl daemon-reload
-
 # HACK: we need to restart it in case aufs-dkms was installed after docker.io
 # and thus docker.io auto-switches its backend
 systemctl restart docker || journalctl -u docker
diff --git a/bots/images/ubuntu-1604 b/bots/images/ubuntu-1604
index e574ca78fb27..be4ff9945234 120000
--- a/bots/images/ubuntu-1604
+++ b/bots/images/ubuntu-1604
@@ -1 +1 @@
-ubuntu-1604-f5793376cca661d19f4888339000d1f7c49430f09891b080ad8d709b1fbe6206.qcow2
\ No newline at end of file
+ubuntu-1604-6823f032bfecbb90401b95e527e25c9aed989a9cc458c612fe451b4c6391dede.qcow2
\ No newline at end of file
diff --git a/bots/images/ubuntu-stable b/bots/images/ubuntu-stable
index 93693d66c568..d6844478f5f2 120000
--- a/bots/images/ubuntu-stable
+++ b/bots/images/ubuntu-stable
@@ -1 +1 @@
-ubuntu-stable-3218549bc200d1718cd6d5e3bef5e6e520d1c423ac676a4f8ec72f08fb8dd343.qcow2
\ No newline at end of file
+ubuntu-stable-ab368e6d389e94014ea16b09eb9c4ba85081a105decab59efef642184b4bfb01.qcow2
\ No newline at end of file