diff --git a/composed/Dockerfile b/composed/Dockerfile
index eae6205..2fd9b26 100644
--- a/composed/Dockerfile
+++ b/composed/Dockerfile
@@ -2,6 +2,12 @@ FROM ubuntu:xenial
 
 MAINTAINER Ephraim Muhia (emuhia@ona.io)
 
+# RUN echo "deb [check-valid-until=no] http://cdn-fastly.deb.debian.org/debian jessie main" > /etc/apt/sources.list.d/jessie.list
+RUN echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
+RUN touch /etc/apt/sources.list
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+RUN echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/100disablechecks
+RUN apt-get -o Acquire::Check-Valid-Until=false update
 
 # Installing supervisord
 RUN apt-get update && apt-get install -y supervisor
diff --git a/composed/Migration_Dockerfile b/composed/Migration_Dockerfile
index 3c93ffd..0527beb 100644
--- a/composed/Migration_Dockerfile
+++ b/composed/Migration_Dockerfile
@@ -2,6 +2,13 @@ FROM java:openjdk-8u111-jdk
 
 MAINTAINER Samuel Githengi (sgithengi@ona.io)
 
+# RUN echo "deb [check-valid-until=no] http://cdn-fastly.deb.debian.org/debian jessie main" > /etc/apt/sources.list.d/jessie.list
+RUN echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
+RUN touch /etc/apt/sources.list
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+RUN echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/100disablechecks
+RUN apt-get -o Acquire::Check-Valid-Until=false update
+
 #Install database clients ,netcat and maven
 RUN apt-get update && \
 apt-get install -y netcat && \
@@ -151,4 +158,4 @@ mkdir -p /tmp/.OpenMRS${application_suffix}/patient_images/ && \
 tar -xf /tmp/images.tar.gz -C /tmp/.OpenMRS${application_suffix}/patient_images && \
 rm /tmp/images.tar.gz || :
 
-ENTRYPOINT ["/usr/local/bin/entrypoint-migrations.sh"]
\ No newline at end of file
+ENTRYPOINT ["/usr/local/bin/entrypoint-migrations.sh"]
diff --git a/composed/docker-compose.yml b/composed/docker-compose.yml
index e8fc89f..8b64fa9 100644
--- a/composed/docker-compose.yml
+++ b/composed/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       MYSQL_PASSWORD: ${MYSQL_OPENMRS_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_OPENMRS_DATABASE}
   couchdb:
-    image: "klaemo/couchdb:1.6.1"
+    image: "couchdb:2.3.0"
     volumes:
       - opensrp_couchdb:/usr/local/var/lib/couchdb
     environment:
diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index d5371f1..5ca05a0 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
   couchdb:
-    image: "klaemo/couchdb:1.6.1"
+    image: "couchdb:2.3.0"
     volumes:
       - opensrp_couchdb:/usr/local/var/lib/couchdb
     environment:
@@ -208,4 +208,4 @@ volumes:
   opensrp_postgres:
   opensrp_postgres_tablespaces:
   opensrp_redis:
-  opensrp_migrations:
\ No newline at end of file
+  opensrp_migrations: