diff --git a/Changelog.md b/Changelog.md
index 9e77e24..368cf7f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Added
+* [DOCKER-438] DOCKER-438 add back solr 2.0.6  [#95]
+
 ### Added
 * [DOCKER-438] upgrade solr from 2.0.6 to 2.0.8.1 [#91]
 
diff --git a/settings.gradle b/settings.gradle
index ebbbcb4..b837db8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,14 +8,18 @@ def includeProject(String folder,String flavor, String version) {
 
 if (includeCommunity == 'true') {
     includeProject('upstream','solr6','alfresco-search-services-community-1.4.3.4')
+    includeProject('upstream','solr6','alfresco-search-services-community-2.0.6')
     includeProject('upstream','solr6','alfresco-search-services-community-2.0.8.1')
     includeProject('xenit','solr6','alfresco-search-services-community-1.4.3.4')
+    includeProject('xenit','solr6','alfresco-search-services-community-2.0.6')
     includeProject('xenit','solr6','alfresco-search-services-community-2.0.8.1')
 }
 
 if (includeEnterprise == 'true') {
     includeProject('upstream','solr6','alfresco-search-services-enterprise-1.4.3.4')
+    includeProject('upstream','solr6','alfresco-search-services-enterprise-2.0.6')
     includeProject('upstream','solr6','alfresco-search-services-enterprise-2.0.8.1')
     includeProject('xenit','solr6','alfresco-search-services-enterprise-1.4.3.4')
     includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.8.1')
+    includeProject('xenit','solr6','alfresco-search-services-enterprise-2.0.6')
 }
diff --git a/upstream/solr6/alfresco-search-services-community-2.0.6/overload.gradle b/upstream/solr6/alfresco-search-services-community-2.0.6/overload.gradle
new file mode 100644
index 0000000..df5ddf2
--- /dev/null
+++ b/upstream/solr6/alfresco-search-services-community-2.0.6/overload.gradle
@@ -0,0 +1,15 @@
+ext {
+    solr = [
+            version: [
+                    major: 2,
+                    minor: 0,
+                    rev: '6'
+            ],
+            flavor: 'solr6'
+    ]
+    alfrescoimage ='docker.io/xenit/alfresco-repository-community:6.2'
+    tests = true
+}
+dependencies {
+    runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.6', ext: 'zip'
+}
diff --git a/upstream/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle b/upstream/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle
new file mode 100644
index 0000000..a983ce9
--- /dev/null
+++ b/upstream/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle
@@ -0,0 +1,18 @@
+ext {
+    solr = [
+            version: [
+                    major: 2,
+                    minor: 0,
+                    rev: '6'
+            ],
+            flavor: 'solr6'
+    ]
+// default integrationTests (using SSL) is failing when using ACS >= 6.2.1, fallback to 6.2.0
+//    alfrescoimage ='private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2.19'
+    alfrescoimage ='private.docker.xenit.eu/alfresco-enterprise/alfresco-repository-enterprise:6.2.2'
+    tests = true
+    testsShardedNonSsl = true
+}
+dependencies {
+    runtime group: 'org.alfresco', name: 'alfresco-search-services', version: '2.0.6', ext: 'zip'
+}
diff --git a/xenit/solr6/alfresco-search-services-community-2.0.6/overload.gradle b/xenit/solr6/alfresco-search-services-community-2.0.6/overload.gradle
new file mode 100644
index 0000000..9c22801
--- /dev/null
+++ b/xenit/solr6/alfresco-search-services-community-2.0.6/overload.gradle
@@ -0,0 +1,11 @@
+ext {
+  tests = true
+  // since s.s. 2.0.3 SSL is required
+  tests_use_ssl = true
+  composeFiles = ["$composeDir/docker-compose-alfresco.yml",
+                     "$composeDir/docker-compose-solr.yml",
+                     "$composeDir/docker-compose-db.yml"];
+}
+dependencies {
+    telemetry group: 'eu.xenit.alfred.telemetry', name: 'alfred-telemetry-solr6', version: "${alfredTelemetryVersion}"
+}
diff --git a/xenit/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle b/xenit/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle
new file mode 100644
index 0000000..f6f157d
--- /dev/null
+++ b/xenit/solr6/alfresco-search-services-enterprise-2.0.6/overload.gradle
@@ -0,0 +1,11 @@
+ext {
+  tests = true
+  // since s.s. 2.0.3 SSL is required
+  tests_use_ssl = true
+  composeFiles = ["$composeDir/docker-compose-alfresco.yml",
+                     "$composeDir/docker-compose-solr.yml",
+                     "$composeDir/docker-compose-db.yml"];
+}
+dependencies {
+    telemetry group: 'eu.xenit.alfred.telemetry', name: 'alfred-telemetry-solr6', version: "${alfredTelemetryVersion}"
+}
\ No newline at end of file