diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index 92d0ce8b4f291ebf6cfc934f7ab34513d6507ea1..7d5bd4916237ad5d51ffd803b9e4553f7eaa7f6e 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -681,7 +681,9 @@ export PYQT4VER=4.11.4
 export BOTTLENECKVER=1.2.0
 export HDF4VER=4.2.11
 export PYHDFVER=0.9
-export PYRESAMPLEVER=1.2.6
+export PYYAMLVER=3.12
+export PYKDTREEVER=1.2.1
+export PYRESAMPLEVER=1.5.0
 export PYINOTIFYVER=0.9.4
 export SHAPELYVER=1.6a1
 export PILVER=1.1.7
@@ -3908,6 +3910,16 @@ mk_mpi4py() {
   return 0
 }
 
+mk_pykdtree() {
+  resume_tracker && return 0
+  _setup_build_install pykdtree src/optional/pykdtree-${PYKDTREEVER}.tar.gz pykdtree-${PYKDTREEVER}
+}
+
+mk_pyyaml() {
+  resume_tracker && return 0
+  _setup_build_install pyyaml src/optional/PyYAML-${PYYAMLVER}.tar.gz pyyaml-${PYYAMLVER}
+}
+
 mk_pyresample() {
   resume_tracker && return 0
   _setup_build_install pyresample src/optional/pyresample-${PYRESAMPLEVER}.tar.gz pyresample-${PYRESAMPLEVER}
@@ -6076,6 +6088,8 @@ mk_cspp() {
     && mk_cffi \
     && mk_shapely \
     && mk_inotify \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
@@ -6096,7 +6110,7 @@ mk_polar2grid() {
   # && mk_mpld3 \
 
   resume_tracker && return 0
-    mk_core py2 \
+    mk_core py3 \
     && mk_jpeg \
     && mk_png \
     && mk_tiff \
@@ -6121,6 +6135,8 @@ mk_polar2grid() {
     && mk_netcdf4 && mk_netcdf4py \
     && mk_pycparser \
     && mk_shapely \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
@@ -6141,6 +6157,8 @@ mk_eumetsat() {
     && mk_pylibtiff \
     && mk_shapely \
     && mk_inotify \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
@@ -6184,6 +6202,8 @@ mk_lidar() {
     && mk_pylibtiff \
     && mk_shapely \
     && mk_inotify \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
@@ -6222,6 +6242,8 @@ mk_hhg() {
     && mk_pylibtiff \
     && mk_shapely \
     && mk_inotify \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
@@ -6253,6 +6275,8 @@ mk_circus() {
     && mk_pylibtiff \
     && mk_shapely \
     && mk_inotify \
+    && mk_pykdtree \
+    && mk_pyyaml \
     && mk_configobj \
     && mk_pyresample \
     && mk_bottleneck \
diff --git a/ShellB3/src/optional/PyYAML-3.12.tar.gz b/ShellB3/src/optional/PyYAML-3.12.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..138e7a26c409927b74030c97f87c12c4a170c7b4
--- /dev/null
+++ b/ShellB3/src/optional/PyYAML-3.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab
+size 253011
diff --git a/ShellB3/src/optional/pykdtree-1.2.1.tar.gz b/ShellB3/src/optional/pykdtree-1.2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..02a362641b52d6da37765b84fd19370d713e7c70
--- /dev/null
+++ b/ShellB3/src/optional/pykdtree-1.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d9dd0b4ad4818996ff2439d0366e514126655c034d73e122f1bb39c3c494b68
+size 59745
diff --git a/ShellB3/src/optional/pyresample-1.2.6.tar.gz b/ShellB3/src/optional/pyresample-1.2.6.tar.gz
deleted file mode 100644
index 1dddefa8801324d162f5741b476a2bf447be3fc4..0000000000000000000000000000000000000000
--- a/ShellB3/src/optional/pyresample-1.2.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6226859fee75c113700a8d9d6b8e9de83ea2f0003d8426b7f1b5ef04daf74b2e
-size 2036557
diff --git a/ShellB3/src/optional/pyresample-1.5.0.tar.gz b/ShellB3/src/optional/pyresample-1.5.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8bc789ab75cdaf59aaa8901c51d000d1918c8019
--- /dev/null
+++ b/ShellB3/src/optional/pyresample-1.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a03db5f5a9df09df3524dc62e53aa54103c0b96390a99f6cbd3c9a6130c2f0b1
+size 5534327
diff --git a/docker_shellb3/Dockerfile b/docker_shellb3/Dockerfile
index e1a2defd09aa3adf9d693c22b3e0dfd31e88d8f2..3383e047105ea8ac79ca8fde70cfc65cbafe0730 100644
--- a/docker_shellb3/Dockerfile
+++ b/docker_shellb3/Dockerfile
@@ -1,6 +1,4 @@
 FROM centos:6
 ENV PORTABLESHELLB3="Y"
 RUN yum -y install gcc-gfortran gcc-c++ unzip perl patch yacc bison flex gettext expat-devel git
-ADD go.sh /
-ENTRYPOINT ["bash", "go.sh"]
 
diff --git a/docker_shellb3/go.sh b/docker_shellb3/go.sh
deleted file mode 100644
index ee21276f6430a393502004510587e478a16755cd..0000000000000000000000000000000000000000
--- a/docker_shellb3/go.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd /host/ShellB3 && bash shallbethree.sh $@