-

diff --git a/docker/hub-docker/build.gradle b/docker/hub-docker/build.gradle
index 312f077a9f..0277ac01b6 100644
--- a/docker/hub-docker/build.gradle
+++ b/docker/hub-docker/build.gradle
@@ -14,14 +14,14 @@ dockerDistributions{
 		orchestrations{
 			dockerCompose{
 				outputDir = 'docker-compose'
-				
+
 				yamlFiles 'src/main/docker-compose/common/docker-compose.dbmigrate.yml.template'
-				
+
 				mergeComposeFiles 'src/main/docker-compose/common/docker-compose.db.yml.template'
 				mergeComposeFiles 'src/main/docker-compose/common/docker-compose.yml.template'
 				mergeComposeFiles 'src/main/docker-compose/docker-compose/docker-compose.prod.yml'
 			  	mergeComposeFiles 'src/main/docker-compose/docker-compose/docker-compose.prod.db.yml'
-				
+
 				mergeExtDbComposeFiles 'src/main/docker-compose/common/docker-compose.yml.template'
 				mergeExtDbComposeFiles 'src/main/docker-compose/docker-compose/docker-compose.prod.yml'
 				mergeExtDbComposeFiles 'src/main/docker-compose/common/docker-compose.externaldb.yml.template'
@@ -31,86 +31,97 @@ dockerDistributions{
 			}
 			dockerSwarm{
 				outputDir = 'docker-swarm'
-				
+
 				yamlFiles 'src/main/docker-compose/common/docker-compose.dbmigrate.yml.template'
-				
+
 				mergeComposeFiles 'src/main/docker-compose/common/docker-compose.db.yml.template'
 				mergeComposeFiles 'src/main/docker-compose/common/docker-compose.yml.template'
 				mergeComposeFiles project.file('src/main/docker-compose/docker-swarm').listFiles()
-				
+
 				mergeExtDbComposeFiles 'src/main/docker-compose/common/docker-compose.yml.template'
 				mergeExtDbComposeFiles 'src/main/docker-compose/docker-swarm/docker-compose.prod.yml'
 				mergeExtDbComposeFiles 'src/main/docker-compose/common/docker-compose.externaldb.yml.template'
 			}
 			kubernetes {
-             				outputDir = 'kubernetes'
-            				yamlFiles = ['src/main/dist/kubernetes/kubernetes-pre-db.yml.template', 'src/main/dist/kubernetes/kubernetes-post-db.yml.template']
-            }
-            openshift {
-                            outputDir = 'openshift'
-                            yamlFiles =
-                            ['src/main/dist/openshift/openshift.yml.template']
-            }
-    	}
+				outputDir = 'kubernetes'
+  			yamlFiles = ['src/main/dist/kubernetes/kubernetes-pre-db.yml.template', 'src/main/dist/kubernetes/kubernetes-post-db.yml.template']
+      }
+      openshift {
+        outputDir = 'openshift'
+        yamlFiles = ['src/main/dist/openshift/openshift.yml.template']
+      }
     }
+  }
 	onPrem{
 		orchestrations{
 			dockerCompose{
 				extendsFrom main.orchestrations.dockerCompose
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
-				
+
 				mergeComposeFiles 'src/onPrem/docker-compose/common/docker-compose.onprem.yml.template'
-				
+
 				mergeExtDbComposeFiles 'src/onPrem/docker-compose/common/docker-compose.onprem.yml.template'
 			}
 			dockerRun{
 				extendsFrom main.orchestrations.dockerRun
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
 			}
 			dockerSwarm{
 				extendsFrom main.orchestrations.dockerSwarm
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
 			}
+			kubernetes{
+				extendsFrom main.orchestrations.kubernetes
+			}
+			openshift{
+			  extendsFrom main.orchestrations.openshift
+			}
 		}
 	}
 	dev{
 		orchestrations{
 			dockerCompose{
 				extendsFrom main.orchestrations.dockerCompose
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
-				
+
 				mergeComposeFiles 'src/dev/docker-compose/common/docker-compose.dev.yml.template'
-				
+
 				mergeExtDbComposeFiles 'src/dev/docker-compose/common/docker-compose.dev.yml.template'
 				mergeExtDbComposeFiles 'src/dev/docker-compose/common/docker-compose.externaldb.dev.yml.template'
 			}
 			dockerRun{
 				extendsFrom main.orchestrations.dockerRun
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
 			}
 			dockerSwarm{
 				extendsFrom main.orchestrations.dockerSwarm
-				
+
 				environmentFiles.remove(file("src/main/env/hub-proxy.env"))
-				
+
 				mergeComposeFiles 'src/dev/docker-compose/common/docker-compose.dev.yml.template'
-				
+
 				mergeExtDbComposeFiles 'src/dev/docker-compose/common/docker-compose.dev.yml.template'
 			}
+			kubernetes{
+				extendsFrom main.orchestrations.kubernetes
+			}
+			openshift{
+			  extendsFrom main.orchestrations.openshift
+			}
 		}
 	}
 	perfTest{
 		orchestrations{
 			dockerCompose{
 				extendsFrom main.orchestrations.dockerCompose
-				
+
 				mergeComposeFiles 'src/perfTest/docker-compose/common/docker-compose.perftest.yml.template'
-				
+
 				mergeExtDbComposeFiles 'src/perfTest/docker-compose/common/docker-compose.perftest.yml.template'
 			}
 			dockerRun{
@@ -118,11 +129,17 @@ dockerDistributions{
 			}
 			dockerSwarm{
 				extendsFrom main.orchestrations.dockerSwarm
-				
+
 				mergeComposeFiles 'src/perfTest/docker-compose/common/docker-compose.perftest.yml.template'
-				
+
 				mergeExtDbComposeFiles 'src/perfTest/docker-compose/common/docker-compose.perftest.yml.template'
 			}
+			kubernetes{
+				extendsFrom main.orchestrations.kubernetes
+			}
+			openshift{
+			  extendsFrom main.orchestrations.openshift
+			}
 		}
 	}
 }
@@ -143,7 +160,7 @@ distributions {
   onPrem {
     contents {
       from "src/main/dist"
-    }               
+    }
   }
 }
 
@@ -155,15 +172,15 @@ distributions.each {
 
 	dockerDistributions."${distributionName}".orchestrations.each{ orch ->
 		def assembleOrchestrationTask = tasks.create("assembleOrchestration${distributionName.capitalize()}${orch.name.capitalize()}", OrchestrationAssembleTask)
-		
+
 		//OrchestrationAssembleTask
 		assembleOrchestrationTask.orchestration = orch
-		
+
 		def distPrefix = distributionName == "main" ? "d" : distributionName + "D"
 		tasks."${distPrefix}istTar".dependsOn assembleOrchestrationTask
 		tasks."${distPrefix}istZip".dependsOn assembleOrchestrationTask
    }
-	
+
 	distributions."${distributionName}".contents {
 		from dockerDistributions."${distributionName}".destinationDir
 	}