diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f63f20..16bf47c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ FireLoop Project Change Log
 ===========================
 
 
+### Release 1.0.0-beta.1.3
+
+- Replaces 1.0.0-beta.1.2
+- Fix npm keepme bug, not replicable in local using npm link
+
 ### Release 1.0.0-beta.1
 
 - Angular 2 (ng2web, ng2native, ng2ionic, ng2universal)
diff --git a/fireloop-cli/package.json b/fireloop-cli/package.json
index bd2d000..8437f98 100644
--- a/fireloop-cli/package.json
+++ b/fireloop-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mean-expert/fireloop",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "description": "This CLI Tool generates FireLoop projects and provides a handful way to work with MEAN Stack based Applications.",
   "main": "index.js",
   "bin": {
@@ -27,7 +27,7 @@
     "angular-cli": "^1.0.0-beta.24",
     "chalk": "1.1.3",
     "extfs": "0.0.7",
-    "generator-fireloop": "1.0.0-beta.1",
+    "generator-fireloop": "1.0.0-beta.1.3",
     "yargs": "6.3.0",
     "yeoman-environment": "1.6.5"
   }
diff --git a/generator-fireloop/generators/server/index.js b/generator-fireloop/generators/server/index.js
index 6b73792..fd6e5b0 100644
--- a/generator-fireloop/generators/server/index.js
+++ b/generator-fireloop/generators/server/index.js
@@ -69,11 +69,6 @@ module.exports = generators.Base.extend({
                 output: { directory: 'server', file: 'model-config.json' },
                 params: {}
             },
-            {
-                template: 'templates/.keepme',
-                output: { directory: 'tests', file: '.keepme' },
-                params: {}
-            },
             {
                 template: 'templates/fireloop/testing.ts',
                 output: { directory: 'server/boot', file: 'testing.ts' },
@@ -98,6 +93,11 @@ module.exports = generators.Base.extend({
                 template: 'templates/fireloop/tsconfig.json',
                 output: { directory: './', file: 'tsconfig.json' },
                 params: {}
+            },
+            {
+                template: 'templates/tests/keepme.txt',
+                output: { directory: 'tests', file: '.keepme' },
+                params: {}
             }
         ].forEach(function (config) {
             console.info('Generating: %s', "" + config.output.file);
diff --git a/generator-fireloop/generators/server/index.js.map b/generator-fireloop/generators/server/index.js.map
index 634ff19..2bfbf32 100644
--- a/generator-fireloop/generators/server/index.js.map
+++ b/generator-fireloop/generators/server/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAEA,IAAI,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC7C,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC9B,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,IAAI,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AACzB,IAAY,KAAK,WAAM,OAAO,CAAC,CAAA;AAC/B,IAAY,IAAI,WAAM,MAAM,CAAC,CAAA;AAC7B;;;;;GAKG;AACH,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;IACtC,2CAA2C;IAC3C,WAAW,EAAE;QACX,kFAAkF;QAClF,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,0CAA0C,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,uEAAuE;IACvE,WAAW,EAAE;QACX,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE;YACpC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;SACjC,EAAE;YACC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;SACzC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE;QACP,IAAI,CAAC,UAAU,CAAC;YACd,mCAAmC;YACnC,SAAS;YACT,YAAY;YACZ,aAAa;YACb,cAAc;SACf,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC;YACd,0CAA0C;YAC1C,mCAAmC;YACnC,oBAAoB;YACpB,0BAA0B;YAC1B,6BAA6B;YAC7B,eAAe;YACf,MAAM;YACN,OAAO;YACP,WAAW;YACX,eAAe;SAChB,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACvB,CAAC;IACD,GAAG,EAAE;QACH,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC,CAAC;QAClE;YACE;gBACE,QAAQ,EAAE,0CAA0C;gBACpD,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,uBAAuB,EAAE;gBAC9D,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,8BAA8B;gBACxC,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE;gBAClD,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,sCAAsC;gBAChD,MAAM,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,EAAE;gBAC1D,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,+BAA+B;gBACzC,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE;gBACxD,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,4BAA4B;gBACtC,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;gBACrD,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,sCAAsC;gBAChD,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE;gBAC/D,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,iCAAiC;gBAC3C,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE;gBACjD,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,kCAAkC;gBAC5C,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE;gBAClD,MAAM,EAAE,EAAE;aACX;YACD;gBACE,QAAQ,EAAE,4BAA4B;gBACtC,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC/C,MAAM,EAAE,EAAE;aACX;SACF,CAAC,OAAO,CAAC,UAAU,MAAW;YAC7B,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxD,IAAI,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1D,8CAA8C;YAC9C,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACzB,CACA;YAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACT,MAAM,CAAC,IAAI,CAAC,CAAC;gBACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACzB,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,qBAAqB,EAAE;YACtC,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;gBAC9C,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,uBAAuB;wBAC9B,QAAQ,EAAE,2BAA2B;wBACrC,IAAI,EAAE,gCAAgC;qBACvC;iBACF;aACF;SACF,CAAC,CAAC;QACH,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7B,MAAM,CAAC;QACT,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACnD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAClD,CAAC;CACF,CAAC,CAAC;AAEH,kBAAkB,GAAQ,EAAE,MAAW;IACrC,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAClC,GAAG,CAAC,MAAM,CACR,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,EACjD,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EACxB,MAAM,CAAC,MAAM,CACd,CACF,CAAC;AACJ,CAAC"}
\ No newline at end of file
diff --git a/generator-fireloop/package.json b/generator-fireloop/package.json
index 7e16221..f1d58ed 100644
--- a/generator-fireloop/package.json
+++ b/generator-fireloop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fireloop",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "main": "generators/app/index.js",
   "author": {
     "name": "Jonathan Casarrubias",
@@ -30,7 +30,7 @@
     "chalk": "1.1.3",
     "change-case": "3.0.0",
     "command-exists": "1.0.2",
-    "generator-fllb": "1.0.0-beta.1",
+    "generator-fllb": "1.0.0-beta.1.3",
     "nodemon": "1.11.0",
     "rimraf": "2.5.4",
     "snyk": "1.19.1",
diff --git a/generator-fireloop/src/server/index.ts b/generator-fireloop/src/server/index.ts
index beae4f2..5a75308 100644
--- a/generator-fireloop/src/server/index.ts
+++ b/generator-fireloop/src/server/index.ts
@@ -71,11 +71,6 @@ module.exports = generators.Base.extend({
         output: { directory: 'server', file: 'model-config.json' },
         params: {}
       },
-      {
-        template: 'templates/.keepme',
-        output: { directory: 'tests', file: '.keepme' },
-        params: {}
-      },
       {
         template: 'templates/fireloop/testing.ts',
         output: { directory: 'server/boot', file: 'testing.ts' },
@@ -100,6 +95,11 @@ module.exports = generators.Base.extend({
         template: 'templates/fireloop/tsconfig.json',
         output: { directory: './', file: 'tsconfig.json' },
         params: {}
+      },
+      {
+        template: 'templates/tests/keepme.txt',
+        output: { directory: 'tests', file: '.keepme' },
+        params: {}
       }
     ].forEach(function (config: any) {
       console.info('Generating: %s', "" + config.output.file);
diff --git a/generator-fireloop/templates/.keepme b/generator-fireloop/templates/tests/keepme.txt
similarity index 100%
rename from generator-fireloop/templates/.keepme
rename to generator-fireloop/templates/tests/keepme.txt
diff --git a/generator-fllb/package.json b/generator-fllb/package.json
index 3b4bf08..0c380c6 100644
--- a/generator-fllb/package.json
+++ b/generator-fllb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fllb",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "description": "Yeoman generator for LoopBack within FireLoop environment",
   "license": "MIT",
   "main": "app/index.js",