diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 795b397..5d8cac7 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -42,7 +42,7 @@ rm -r cmake-${cmake_version}*
 RUN echo Installing Boost; \
 BOOST_V=`echo ${boost_version} | sed s/'\.'/'_'/g`; \
 source scl_source enable devtoolset-8; \
-wget --progress=bar:force https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
+wget --progress=bar:force https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
 tar xzf boost_${BOOST_V}.tar.gz; \
 cd boost_${BOOST_V}; \
 ./bootstrap.sh; \
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 592a40d..8f68ea5 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -28,7 +28,7 @@ rm -r cmake-${cmake_version}*
 
 RUN echo Installing Boost; \
 BOOST_V=`echo ${boost_version} | sed s/'\.'/'_'/g`; \
-wget --progress=bar:force https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
+wget --progress=bar:force https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${BOOST_V}.tar.gz; \
 tar xzf boost_${BOOST_V}.tar.gz; \
 cd boost_${BOOST_V}; \
 ./bootstrap.sh; \
diff --git a/include/ElasticSearchBase.h b/include/ElasticSearchBase.h
index e1fe927..7f79eb6 100644
--- a/include/ElasticSearchBase.h
+++ b/include/ElasticSearchBase.h
@@ -42,6 +42,5 @@ class ElasticSearchBase : public TimedRestBatcher, public
 
   const bool mStats;
   MovingCountersSet* const mCounters;
-  const std::string DEFAULT_TYPE;
 };
 #endif //EPIPE_ELASTICSEARCHBASE_H
diff --git a/src/ElasticSearchBase.cpp b/src/ElasticSearchBase.cpp
index 74c16e1..34160f7 100644
--- a/src/ElasticSearchBase.cpp
+++ b/src/ElasticSearchBase.cpp
@@ -24,11 +24,11 @@ elastic_client_config, int time_to_wait_before_inserting, int bulk_size,
 const bool statsEnabled, MovingCountersSet* const
 metricsCounters) : TimedRestBatcher(elastic_client_config,
     time_to_wait_before_inserting, bulk_size),  mStats
-    (statsEnabled), mCounters(metricsCounters), DEFAULT_TYPE("_doc") {
+    (statsEnabled), mCounters(metricsCounters) {
 }
 
 std::string ElasticSearchBase::getElasticSearchBulkUrl(std::string index) {
-  std::string str = "/" + index + "/" + DEFAULT_TYPE + "/_bulk";
+  std::string str = "/" + index + "/_bulk";
   return str;
 }
 
diff --git a/src/FileProvenanceElasticDataReader.cpp b/src/FileProvenanceElasticDataReader.cpp
index 645d9df..7a818d1 100644
--- a/src/FileProvenanceElasticDataReader.cpp
+++ b/src/FileProvenanceElasticDataReader.cpp
@@ -31,7 +31,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
     op.AddMember("update", opVal, opAlloc);
 
@@ -80,7 +79,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
     op.AddMember("update", opVal, opAlloc);
 
@@ -117,7 +115,6 @@ class ElasticHelper {
 
     rapidjson::Value cleanupIdVal(rapidjson::kObjectType);
     cleanupIdVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), cleanupAlloc), cleanupAlloc);
-    cleanupIdVal.AddMember("_type", rapidjson::Value().SetString("_doc", cleanupAlloc), cleanupAlloc);
     cleanupIdVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), cleanupAlloc), cleanupAlloc);
 
     cleanupId.AddMember("update", cleanupIdVal, cleanupId.GetAllocator());
@@ -147,7 +144,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
     op.AddMember("update", opVal, opAlloc);
 
@@ -210,7 +206,6 @@ class ElasticHelper {
 
     rapidjson::Value cleanupIdVal(rapidjson::kObjectType);
     cleanupIdVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), cleanupAlloc), cleanupAlloc);
-    cleanupIdVal.AddMember("_type", rapidjson::Value().SetString("_doc", cleanupAlloc), cleanupAlloc);
     cleanupIdVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), cleanupAlloc), cleanupAlloc);
     cleanupId.AddMember("update", cleanupIdVal, cleanupAlloc);
 
@@ -253,7 +248,6 @@ class ElasticHelper {
     rapidjson::Value opVal(rapidjson::kObjectType);
 
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
 
     op.AddMember("delete", opVal, opAlloc);
@@ -275,7 +269,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
 
     op.AddMember("update", opVal, opAlloc);
@@ -327,7 +320,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
 
     op.AddMember("update", opVal, opAlloc);
@@ -392,7 +384,6 @@ class ElasticHelper {
 
     rapidjson::Value opVal(rapidjson::kObjectType);
     opVal.AddMember("_id", rapidjson::Value().SetString(id.c_str(), opAlloc), opAlloc);
-    opVal.AddMember("_type", rapidjson::Value().SetString("_doc", opAlloc), opAlloc);
     opVal.AddMember("_index", rapidjson::Value().SetString(index.c_str(), opAlloc), opAlloc);
 
     op.AddMember("update", opVal, opAlloc);