diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic b/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic
index 3a3f1422..ef6745f8 100644
--- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic
+++ b/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic
@@ -1,11 +1,11 @@
 ARG baseimg=docker.io/ubuntu:bionic
 FROM ${baseimg}
 
-# Nautilus 14.2.9
-ARG CEPH_RELEASE=nautilus
-ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key
+# Octopus 15.2.8
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=15.2.8-1bionic
+ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
+ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
diff --git a/ceph-config-helper/Dockerfile.ubuntu_bionic b/ceph-config-helper/Dockerfile.ubuntu_bionic
index 7d281fb9..4e3398d8 100644
--- a/ceph-config-helper/Dockerfile.ubuntu_bionic
+++ b/ceph-config-helper/Dockerfile.ubuntu_bionic
@@ -4,12 +4,12 @@ FROM ${FROM}
 ARG DISTRO_CODENAME='bionic'
 
 ARG KUBE_VERSION=v1.16.2
-# Nautilus 14.2.9
-ARG CEPH_RELEASE=nautilus
-ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
+# Octopus 15.2.8
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=15.2.8-1bionic
 
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/archive-ceph-nautilus.key
+ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
+ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
@@ -34,6 +34,7 @@ RUN set -ex ;\
         udev \
         jq ;\
     curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\
+    pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\
     pip3 --no-cache-dir install --upgrade \
       crush \
       rgwadmin \
diff --git a/ceph-daemon/Dockerfile.ubuntu_bionic b/ceph-daemon/Dockerfile.ubuntu_bionic
index 640cf3c3..ec0517fe 100644
--- a/ceph-daemon/Dockerfile.ubuntu_bionic
+++ b/ceph-daemon/Dockerfile.ubuntu_bionic
@@ -2,13 +2,13 @@ ARG FROM=docker.io/ubuntu:bionic
 FROM ${FROM}
 
 ARG KUBE_VERSION=1.16.2
-# Nautilus 14.2.9
-ARG CEPH_RELEASE=nautilus
-ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
+# Octopus 15.2.8
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=15.2.8-1bionic
 ARG CONFD_VERSION=0.16.0
 
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key
+ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
+ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
@@ -48,6 +48,7 @@ RUN set -ex ;\
         jq \
         alien ;\
     curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\
+    pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\
     pip3 --no-cache-dir install --upgrade \
       six \
       python-openstackclient \
diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic b/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic
index fe4b9359..42fe2867 100644
--- a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic
+++ b/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic
@@ -1,11 +1,12 @@
 ARG baseimg=docker.io/ubuntu:bionic
 FROM ${baseimg}
 
-# Nautilus 14.2.9
-ARG CEPH_RELEASE=nautilus
-ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key
+# Octopus 15.2.8
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=15.2.8-1bionic
+
+ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
+ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\