diff --git a/deploy/addons/coredns/coreDNS-controller.yaml b/deploy/addons/coredns/coreDNS-controller.yaml
index ffd8eaf0fc2d7412d8f08350bc451f41cdc5cb7f..010fb69d7c2033ce7a94af8e3ec082d5d51a9c0d 100644
--- a/deploy/addons/coredns/coreDNS-controller.yaml
+++ b/deploy/addons/coredns/coreDNS-controller.yaml
@@ -25,7 +25,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: coredns
-        image: coredns/coredns:0.9.10
+        image: registry.hub.docker.com/coredns/coredns:0.9.10
         imagePullPolicy: IfNotPresent
         resources:
           limits:
diff --git a/deploy/addons/efk/elasticsearch-rc.yaml b/deploy/addons/efk/elasticsearch-rc.yaml
index 9081f61c70c7ea9035113d03da80baac7e3ea1c1..3288dd0ffcf66a3a827c9b7c26d07e22682e1c91 100644
--- a/deploy/addons/efk/elasticsearch-rc.yaml
+++ b/deploy/addons/efk/elasticsearch-rc.yaml
@@ -58,7 +58,7 @@ spec:
         - name: MINIMUM_MASTER_NODES
           value: "1"
       initContainers:
-      - image: alpine:3.6
+      - image: registry.hub.docker.com/library/alpine:3.6
         command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
         name: elasticsearch-logging-init
         securityContext:
diff --git a/deploy/addons/registry-creds/registry-creds-rc.yaml b/deploy/addons/registry-creds/registry-creds-rc.yaml
index 269526643aa5dfa92320d6fec6a136fa983ccfdf..b75ad5672a5dd7706d32a9785ef536d884163aeb 100644
--- a/deploy/addons/registry-creds/registry-creds-rc.yaml
+++ b/deploy/addons/registry-creds/registry-creds-rc.yaml
@@ -21,7 +21,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: upmcenterprises/registry-creds:1.8
+      - image: registry.hub.docker.com/upmcenterprises/registry-creds:1.8
         name: registry-creds
         imagePullPolicy: Always
         env:
diff --git a/deploy/addons/registry/registry-rc.yaml b/deploy/addons/registry/registry-rc.yaml
index aaee5dd90fdc4d3253879bda6532bfe2b6529fea..aa0a59ee7ace7cca3d33b32fe03ece047657b7a3 100644
--- a/deploy/addons/registry/registry-rc.yaml
+++ b/deploy/addons/registry/registry-rc.yaml
@@ -17,7 +17,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: registry:2.6.1
+      - image: registry.hub.docker.com/library/registry:2.6.1
         imagePullPolicy: IfNotPresent
         name: registry
         ports:
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
index 695def7f6aabe2b20bdb421b7f6a16f9bb94a81e..f0fee400e4f951238142d9d3391214925a9ab28d 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -1 +1 @@
-sha256 00575ca5a093cb1fcd27234f3fc0a729620b7dff7b39057bfddddd48753ff3d7 v1.0.3.tar.gz
+sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
index 1353b02990d2cc24ee3b68158f6f5aa94ee1a8c5..9fc2a6b35cfca45707a9f6d75f49c71b04e869e6 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.0.3
+CRIO_BIN_VERSION = v1.8.4
 CRIO_BIN_SITE = https://github.com/kubernetes-incubator/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = libgpgme
 CRIO_BIN_GOPATH = $(@D)/_output
 CRIO_BIN_ENV = \
+	CGO_ENABLED=1 \
 	GOPATH="$(CRIO_BIN_GOPATH)" \
 	PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH)
 
@@ -26,7 +27,10 @@ define CRIO_BIN_CONFIGURE_CMDS
 endef
 
 define CRIO_BIN_BUILD_CMDS
-	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) binaries PREFIX=/usr BUILDTAGS="containers_image_ostree_stub" 
+	mkdir -p $(@D)/bin
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr pause
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr crio
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr conmon
 endef
 
 define CRIO_BIN_INSTALL_TARGET_CMDS
@@ -36,12 +40,6 @@ define CRIO_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/crio \
 		$(TARGET_DIR)/usr/bin/crio
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/crioctl \
-		$(TARGET_DIR)/usr/bin/crioctl
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/kpod \
-		$(TARGET_DIR)/usr/bin/kpod
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/conmon \
 		$(TARGET_DIR)/usr/libexec/crio/conmon
@@ -64,7 +62,7 @@ endef
 
 define CRIO_BIN_INSTALL_INIT_SYSTEMD
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.systemd DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr
-	$(INSTALL) -Dm755 \
+	$(INSTALL) -Dm644 \
 		$(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/crio.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/crio.service
 	$(call link-service,crio.service)
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf
index 2bc6d88b710834ff4d7d434e02084ec0b4f4b39f..6a6259334491a147eea7a9b256744a3a8e312214 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf
@@ -99,9 +99,20 @@ cgroup_manager = "cgroupfs"
 # hooks_dir_path is the oci hooks directory for automatically executed hooks
 hooks_dir_path = "/usr/share/containers/oci/hooks.d"
 
+# default_mounts is the mounts list to be mounted for the container when created
+default_mounts = [
+]
+
 # pids_limit is the number of processes allowed in a container
 pids_limit = 1024
 
+# enable using a shared PID namespace for containers in a pod
+enable_shared_pid_namespace = false
+
+# log_size_max is the max limit for the container log size in bytes.
+# Negative values indicate that no limit is imposed.
+log_size_max = -1
+
 # The "crio.image" table contains settings pertaining to the
 # management of OCI images.
 [crio.image]
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service
index 67dedf58f0c6380417b68398ece3dbe3cc07fdcb..15419de42e5cd09f8009930343ddcb5d15530e34 100644
--- a/deploy/iso/minikube-iso/package/crio-bin/crio.service
+++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service
@@ -12,9 +12,9 @@ EnvironmentFile=/var/run/minikube/env
 Environment=GOTRACEBACK=crash
 ExecStartPre=/bin/mkdir -p ${PERSISTENT_DIR}/var/lib/containers
 ExecStart=/usr/bin/crio \
-          $CRIO_OPTIONS \
-	  $CRIO_MINIKUBE_OPTIONS \
-	  --root ${PERSISTENT_DIR}/var/lib/containers
+    $CRIO_OPTIONS \
+    $CRIO_MINIKUBE_OPTIONS \
+    --root ${PERSISTENT_DIR}/var/lib/containers
 ExecReload=/bin/kill -s HUP $MAINPID
 TasksMax=8192
 LimitNOFILE=1048576