diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index 854a9ef..24e865c 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -16,8 +16,7 @@
           dist: [ xenial ]
           section: [ stable ]
           filter:
-            # Include only latest Docker packages >= 18.06 && >= 17.12
-            001: "--exclude='docker-ce'"
-            002: "--include='docker-ce_18.((0[6-9])|([1-9][0-9]))'"
-            003: "--include='docker-ce_17.((1[2-9])|([2-9][0-9]))'"
-            003: "--include='docker-ce_((19)|([2-9][0-9]))'"
+            # conteinerD - forked at 'extra' repo.
+            001: --exclude='(docker-ce_17|containerd\.io)'
+            # Drop docker-ce <= 18.09
+            002: --exclude='(docker-ce(-|_)18.0[0-8])'
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index a875544..fad8e17 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -71,6 +71,16 @@
           - universe/translations
           - universe/video
           - universe/x11
+          - zope
+          - main/zope
+          - restricted/zope
+          - universe/zope
+          - 'tex$'
+          - 'main/tex$'
+          - 'restricted/tex$'
+          - 'universe/tex$'
+          - 'text$'
+          - 'universe/text$'
           # Updating filter, please always start from section, aka main|universe|multiverse
           filter:
             1: "--exclude='android*'"
@@ -79,19 +89,13 @@
             5: "--exclude='/*-wallpapers*'"
             6: "--exclude='/language-pack-(?!en)'"
             7: "--exclude='thunderbird*'"
-            8: "--exclude='libreoffice*'"
-            9: "--exclude='openoffice*'"
+            8: --exclude='(libreoffice*|bgoffice|openoffice*)'
             10: "--exclude='live-image-*-desktop*'"
-            11: "--exclude='lubuntu-*'"
-            12: "--exclude='kubuntu-*'"
-            13: "--exclude='cinnamon-*'"
-            14: "--exclude='mate-*'"
-            15: "--exclude='desktop-*'"
+            11: --exclude='(desktop|mate|cinnamon|xubuntu|kubuntu|lubuntu)-*'
             16: "--exclude='flashplugin*'"
-            17: "--exclude='gnome*'"
-            18: "--exclude='/unity*'"
+            17: --exclude='(unity|gnome).*'
             20: "--exclude='openjdk-*-(dbg|demo|source).*'"
-            22: "--exclude='(kde|ubuntu|xfce4|sabily).*artwork*'"
+            22: "--exclude='(kde|ubuntu|xfce4|sabily|sugar).*artwork*'"
             23: "--exclude='ubuntu-touch*'"
             24: "--exclude='remmina*'"
             25: "--exclude='/libbluetooth*'"
@@ -99,31 +103,31 @@
             27: "--exclude='/banshee*'"
             27: "--exclude='/*(.xorg)*joystick'"
             28: "--exclude='/xserver-xorg-video(.*vivid|.*wily|.*utopic)'"
-            30: "--exclude='/*universe.*bluez.*'"
-            32: "--exclude='/main/a/a11y-profile-manager/'"
-            33: "--exclude='/universe/.*(alsa|ubuntuone|telepathy|debian-multimedia|kodi|mediaplayer|nagios|getfem|gammaray|geotranz)'"
-            34: "--exclude='/universe/.*(pyqt|usb-creator|gcc-mingw-w64|gcc-snapshot)'"
-            35: "--exclude='/universe/q/qt'"
-            36: "--exclude='/universe/.*(brasero|mediascanner2|mediatomb|mediawiki|qtmultimedia|pidgin|skype|eclipse|esys-particle|fusion|0/0ad|e/emboss|e/empathy|g/globus)'"
-            84: "--exclude='/multiverse/(v/virtualbox|w/wine|playonlinux)'"
+            30: --exclude='universe.*bluez.*'
+            32: --exclude='main/(a/a11y-profile-manager|e/emacs24|i/ispell|br\.ispell)'
+            33: --exclude='/universe/.*(alsa|ubuntuone|telepathy|debian-multimedia|kodi|mediaplayer|nagios|getfem|gammaray|geotranz|brasero)'
+            34: --exclude='(usb-creator|gcc-snapshot|gcc-mozilla|gccgo|gcc-.*-cross.*|gcc-avr|gcc-3\.3|gcc-4\.[7-8])'
+            35: --exclude='(.*/q/qt|pyqt)'
+            36: --exclude='/universe/.*(mediascanner2|mediatomb|mediawiki|pidgin|eclipse|esys-particle|fusion|e/emboss|e/empathy|g/globus|ecere-sdk|ferret|gap-)'
+            84: --exclude='restricted/b/bcmwl'
             86: "--exclude='/main/(m/mozc/|n/nut/|o/oxide-qt/|o/orbit2/|q/(qtbase-opensource-src|qtdeclarative-opensource-src)/|t/telepathy-glib|w/webkit2gtk|w/webrtc-audio-processing)'"
-            87: "--exclude='universe/(s/syncevolution|r/r-bioc-)'"
-            88: "--exclude='universe/t/texlive-lang/texlive-lang-(?!.*english)'"
-            89: "--exclude='/universe/k/(kde)'"
+            87: --exclude='universe/(s/syncevolution|r/r-bioc-|.*(libbiblio|libbusiness|biococoa))'
+            89: --exclude='universe/(libk/libkde|k/kde|r/rustc|r/root-system|e/emacs|x/xemacs21)'
             90: "--exclude='/universe/p/(psi-plus|puppet-module|plasma|pcl/)'"
-            91: "--exclude='golang-github-*'"
+            91: --exclude='/golang-.*'
             92: "--exclude='/(llvm-toolchain|address-book|amule|openclipart|rhythmbox|gimp|sonic-visualiser|games|bsdgame|gazebo|arduino|webkitgtk|widelands|wxwidget|warzone|wings3d).*'"
             93: "--exclude='/(asterisk|abiword|webbrowser-app|imagemagick|.*clamav|wireshar|vlc|.*transmission|tryton-modules|trilinos|tomboy|wine1|wine-dev|compiz|mythtv|ubuntustudio).*'"
             94: "--exclude='/universe/o/(openstack-debian-images).*'"
-            95: "--exclude='/gcc-.*-cross.*'"
             96: "--exclude='/(nvidia).*'"
-            97: "--exclude='/universe/.*(metastudent).*'"
+            97: --exclude='(gambas3|opengl|screensaver|taoframework)'
             # Drop all dbg pkgs
             98: --exclude='(-|_)dbg(_|-)'
+            99: --exclude='mythbuntu|network-manager-applet|debian-junior|game-music-emu|fp-units-castle-game-engine|asio|unidic-mecab|zope\.'
+            100: --exclude='kineticstools|juju-(deployer|mongo|core)|felix-latin|fonts-(yozvox-yozfont|nanum|roboto|baekmuk|arphic-.*|takao|noto-cjk|ipamj-mincho)|insighttoolkit|axiom'
+            101: --exclude='openjdk-(8|9)(?!.*jre-headless.*)'
             # List of unused linux kernels and unsupported arch
-            300: "--exclude='/.*(arm64|powerpc|s390x|armel|armhf|sparc64|mips64|ppc64el|mipsn32)(?!.*amd64)'"
-            301: "--exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'"
-            302: "--exclude='/*universe.*(-armel-|-arm-)(?!.*amd64)'"
+            300: --exclude='.*-(alpha|arm64|powerpc|s390x|armel|armhf|arm-|aarch64-|sparc64|mips64|mips|ppc64el|mipsn32|hppa|m68k|sh4|mipsel|ppc64|m68hc1|mingw-w64)'
+            301: --exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'
             303: "--exclude='/main/l/linux(.*)/linux-source-*'"
             # Old minor version of kernel|tools|extra|cloud and related.
             # Generic: Old - if minor less then < 136, but not 4numeric
@@ -140,8 +144,8 @@
             309: --exclude='main/l/linux.*/linux-.*4\.4\.0-'
             # List of packages, that should be fetched from fresh ppa or other mirror
             # So,removing them from upstream mirror.
-            500: "--exclude='/main/m/maas/'"
-            501: "--exclude='/universe/g/glusterfs/'"
+            500: --exclude='main/m/maas/'
+            501: --exclude='universe/g/glusterfs/'
             502: "--exclude='/universe/d/(docker-|docker.io)/'"
             503: "--exclude='/(main|universe)/c/ceph'"
             504: "--exclude='/universe/a/aptly'"
@@ -182,3 +186,5 @@
             805: '--include="/main(.*)llvm-toolchain-(?![1-5])"' # pki-ca: < 389-ds-base < dogtag
             806: "--include='/main(.*)man-db'" # include man tool
             807: "--include='/main(.*)zfs-doc'" # Some extra fs dep's for MAAS provision stage.PROD-21531
+            808: --include='main/.*(linux-libc(-|_|)|libgcc1_).*amd64.deb'
+            809: --include='main/(x/xml-core|s/sgml-base|libxml|.*xmlsec1|.*python(3|)-zope.interface)'
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 7c4fc26..ec4c5d6 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -62,7 +62,7 @@
         name: compose:1.17.1
       - registry: ${_param:mcp_docker_registry}/mirantis/external/osixia
         target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/osixia
-        name: openldap:1.1.8
+        name: openldap:1.2.2
       - registry: ${_param:mcp_docker_registry}/mirantis/external/library
         target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/library
         name: postgres:9.6.10