diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts
index 592441a..9d82074 100644
--- a/dist/npmci.build.docker.d.ts
+++ b/dist/npmci.build.docker.d.ts
@@ -1,9 +1,10 @@
 export declare let build: () => any;
 export declare class Dockerfile {
     filePath: string;
-    buildTag: string;
     repo: string;
     version: string;
+    cleanTag: string;
+    buildTag: string;
     content: string;
     baseImage: string;
     constructor(options: {
diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js
index 26ae75e..c888adc 100644
--- a/dist/npmci.build.docker.js
+++ b/dist/npmci.build.docker.js
@@ -6,7 +6,11 @@ exports.build = function () {
     ;
     plugins.gulp.dest("./Dockerfile*")
         .pipe(readDockerfiles)
-        .pipe(plugins.gulpFunction(done.resolve, "atEnd"));
+        .pipe(plugins.gulpFunction(function () {
+        sortDockerfiles()
+            .then(buildDockerfiles)
+            .then(done.resolve);
+    }, "atEnd"));
     return done.promise;
 };
 var readDockerfiles = function () {
@@ -16,21 +20,56 @@ var readDockerfiles = function () {
             read: true
         });
         NpmciEnv.dockerFiles.push(myDockerfile);
-        file["Dockerfile"] = myDockerfile;
         cb(null, file);
     };
 };
-var buildDockerfiles = function () {
-    return function (file, enc, cb) {
-        file.myDockerfile.build();
-        cb();
+var sortDockerfiles = function () {
+    var done = plugins.q.defer();
+    var redoSort;
+    var sortFunction = function () {
+        redoSort = false;
+        var notYetBuiltImages = [];
+        NpmciEnv.dockerFiles.forEach(function (dockerFileArg) {
+            notYetBuiltImages.push(dockerFileArg.cleanTag);
+        });
+        NpmciEnv.dockerFiles.sort(function (a, b) {
+            plugins.beautylog.log("sort build order for Dockerimages");
+            var aIndex = notYetBuiltImages.indexOf(a.cleanTag);
+            if (aIndex != -1) {
+                notYetBuiltImages.splice(aIndex, 1);
+            }
+            if (notYetBuiltImages.indexOf(b.cleanTag) != -1) {
+                redoSort = true;
+                return -1;
+            }
+            else {
+                return 0;
+            }
+        });
+        if (redoSort) {
+            sortFunction();
+        }
+        else {
+            done.resolve();
+        }
     };
+    sortFunction();
+    return done.promise;
+};
+var buildDockerfiles = function () {
+    var done = plugins.q.defer();
+    NpmciEnv.dockerFiles.forEach(function (dockerfileArg) {
+        dockerfileArg.build();
+    });
+    done.resolve();
+    return done.promise;
 };
 var Dockerfile = (function () {
     function Dockerfile(options) {
         this.filePath = options.filePath;
         this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo;
         this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);
+        this.cleanTag = this.repo + ":" + this.version;
         if (options.filePath && options.read) {
             this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));
         }
@@ -93,4 +132,4 @@ exports.dockerTag = function (repoArg, versionArg) {
     return tagString;
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["npmci.build.docker.ts"],"names":[],"mappings":"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","file":"npmci.build.docker.js","sourcesContent":["import * as plugins from \"./npmci.plugins\"\nimport * as NpmciEnv from \"./npmci.env\";\n\n\nexport let build = function(){\n    let done = plugins.q.defer();;\n    plugins.gulp.dest(\"./Dockerfile*\")\n        .pipe(readDockerfiles)\n        .pipe(plugins.gulpFunction(done.resolve,\"atEnd\"));\n    return done.promise;\n}\n\nlet readDockerfiles = function(){\n    return function(file,enc,cb){\n        let myDockerfile = new Dockerfile({\n            filePath:file.path,\n            read:true\n        });\n        NpmciEnv.dockerFiles.push(\n            myDockerfile\n        );\n        file[\"Dockerfile\"] = myDockerfile;\n        cb(null,file);\n    };\n}\n\nlet buildDockerfiles = function(){\n    return function(file,enc,cb){\n        file.myDockerfile.build();\n        cb();\n    }\n}\n\nexport class Dockerfile {\n    filePath:string;\n    buildTag:string;\n    repo:string;\n    version:string;\n    content:string;\n    baseImage:string;\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\n        this.filePath = options.filePath;\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\n        if(options.filePath && options.read){\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\n        };\n        this.baseImage = dockerBaseImage(this.content);\n    };\n    build(){\n        if(!this.buildTag){\n            let tag = dockerTag(this.repo,this.version);\n            plugins.shelljs.exec(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\n            this.buildTag = tag;\n            NpmciEnv.dockerFilesBuilt.push(this);\n        } else {\n            plugins.beautylog.error(\"This Dockerfile already has been built!\");\n        }\n        \n    };\n    push(){\n        if(this.buildTag){\n            plugins.shelljs.exec(\"docker push \" + this.buildTag);\n        } else {\n            plugins.beautylog.error(\"Dockerfile hasn't been built yet!\");\n        }\n    }\n}\n\nlet dockerFileVersion = function(dockerfileNameArg:string):string{\n    let versionString:string;\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\n    if(regexResultArray.length = 2){\n        versionString = regexResultArray[1];        \n    } else {\n        versionString = \"latest\";\n    }\n    return versionString;\n}\n\nlet dockerBaseImage = function(dockerfileContentArg:string){\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n/\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\n    return regexResultArray[1];\n}\n\nexport let dockerTag = function(repoArg:string,versionArg:string):string{\n    let tagString:string;\n    let registry = NpmciEnv.dockerRegistry;\n    if(process.env.CI_BUILD_STAGE == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"test\" || process.env.CI_BUILD_STAGE == \"build\"){\n        version = version + \"_test\";\n    }\n    tagString = registry + \"/\" + repo + \":\" + version;\n    return tagString;\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["npmci.build.docker.ts"],"names":[],"mappings":"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","file":"npmci.build.docker.js","sourcesContent":["import * as plugins from \"./npmci.plugins\"\nimport * as NpmciEnv from \"./npmci.env\";\n\n\nexport let build = function(){\n    let done = plugins.q.defer();;\n    plugins.gulp.dest(\"./Dockerfile*\")\n        .pipe(readDockerfiles)\n        .pipe(plugins.gulpFunction(function(){\n            sortDockerfiles()\n                .then(buildDockerfiles)\n                .then(done.resolve);\n        },\"atEnd\"));\n    return done.promise;\n}\n\nlet readDockerfiles = function(){\n    return function(file,enc,cb){\n        let myDockerfile = new Dockerfile({\n            filePath:file.path,\n            read:true\n        });\n        NpmciEnv.dockerFiles.push(\n            myDockerfile\n        );\n        cb(null,file);\n    };\n}\n\nlet sortDockerfiles = function(){\n    let done = plugins.q.defer();\n    let redoSort:boolean;\n    let sortFunction = function(){\n        redoSort = false;\n        let notYetBuiltImages:string[] = [];\n        NpmciEnv.dockerFiles.forEach((dockerFileArg)=>{\n            notYetBuiltImages.push(dockerFileArg.cleanTag);\n        });\n        NpmciEnv.dockerFiles.sort(function(a,b){\n            plugins.beautylog.log(\"sort build order for Dockerimages\");\n            let aIndex = notYetBuiltImages.indexOf(a.cleanTag);\n            if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}\n            if(notYetBuiltImages.indexOf(b.cleanTag) != -1){\n                redoSort = true;\n                return -1;\n            } else {\n                return 0\n            }\n        });\n        if(redoSort){\n            sortFunction();\n        } else {\n            done.resolve();\n        }\n    };\n    sortFunction();\n    return done.promise;\n}\n\nlet buildDockerfiles = function(){\n    let done = plugins.q.defer();\n    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){\n        dockerfileArg.build();\n    })\n    done.resolve();\n    return done.promise;\n}\n\nexport class Dockerfile {\n    filePath:string;\n    repo:string;\n    version:string;\n    cleanTag:string;\n    buildTag:string;\n    content:string;\n    baseImage:string;\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\n        this.filePath = options.filePath;\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\n        this.cleanTag = this.repo + \":\" + this.version;\n        if(options.filePath && options.read){\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\n        };\n        this.baseImage = dockerBaseImage(this.content);\n    };\n    build(){\n        if(!this.buildTag){\n            let tag = dockerTag(this.repo,this.version);\n            plugins.shelljs.exec(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\n            this.buildTag = tag;\n            NpmciEnv.dockerFilesBuilt.push(this);\n        } else {\n            plugins.beautylog.error(\"This Dockerfile already has been built!\");\n        }\n        \n    };\n    push(){\n        if(this.buildTag){\n            plugins.shelljs.exec(\"docker push \" + this.buildTag);\n        } else {\n            plugins.beautylog.error(\"Dockerfile hasn't been built yet!\");\n        }\n    }\n}\n\nlet dockerFileVersion = function(dockerfileNameArg:string):string{\n    let versionString:string;\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\n    if(regexResultArray.length = 2){\n        versionString = regexResultArray[1];        \n    } else {\n        versionString = \"latest\";\n    }\n    return versionString;\n}\n\nlet dockerBaseImage = function(dockerfileContentArg:string){\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n/\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\n    return regexResultArray[1];\n}\n\nexport let dockerTag = function(repoArg:string,versionArg:string):string{\n    let tagString:string;\n    let registry = NpmciEnv.dockerRegistry;\n    if(process.env.CI_BUILD_STAGE == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"test\" || process.env.CI_BUILD_STAGE == \"build\"){\n        version = version + \"_test\";\n    }\n    tagString = registry + \"/\" + repo + \":\" + version;\n    return tagString;\n};\n"]}
diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts
index 672ef23..d9c5cd9 100644
--- a/ts/npmci.build.docker.ts
+++ b/ts/npmci.build.docker.ts
@@ -6,7 +6,11 @@ export let build = function(){
     let done = plugins.q.defer();;
     plugins.gulp.dest("./Dockerfile*")
         .pipe(readDockerfiles)
-        .pipe(plugins.gulpFunction(done.resolve,"atEnd"));
+        .pipe(plugins.gulpFunction(function(){
+            sortDockerfiles()
+                .then(buildDockerfiles)
+                .then(done.resolve);
+        },"atEnd"));
     return done.promise;
 }
 
@@ -19,29 +23,62 @@ let readDockerfiles = function(){
         NpmciEnv.dockerFiles.push(
             myDockerfile
         );
-        file["Dockerfile"] = myDockerfile;
         cb(null,file);
     };
 }
 
+let sortDockerfiles = function(){
+    let done = plugins.q.defer();
+    let redoSort:boolean;
+    let sortFunction = function(){
+        redoSort = false;
+        let notYetBuiltImages:string[] = [];
+        NpmciEnv.dockerFiles.forEach((dockerFileArg)=>{
+            notYetBuiltImages.push(dockerFileArg.cleanTag);
+        });
+        NpmciEnv.dockerFiles.sort(function(a,b){
+            plugins.beautylog.log("sort build order for Dockerimages");
+            let aIndex = notYetBuiltImages.indexOf(a.cleanTag);
+            if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}
+            if(notYetBuiltImages.indexOf(b.cleanTag) != -1){
+                redoSort = true;
+                return -1;
+            } else {
+                return 0
+            }
+        });
+        if(redoSort){
+            sortFunction();
+        } else {
+            done.resolve();
+        }
+    };
+    sortFunction();
+    return done.promise;
+}
+
 let buildDockerfiles = function(){
-    return function(file,enc,cb){
-        file.myDockerfile.build();
-        cb();
-    }
+    let done = plugins.q.defer();
+    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){
+        dockerfileArg.build();
+    })
+    done.resolve();
+    return done.promise;
 }
 
 export class Dockerfile {
     filePath:string;
-    buildTag:string;
     repo:string;
     version:string;
+    cleanTag:string;
+    buildTag:string;
     content:string;
     baseImage:string;
     constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){
         this.filePath = options.filePath;
         this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo;
         this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);
+        this.cleanTag = this.repo + ":" + this.version;
         if(options.filePath && options.read){
             this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));
         };