diff --git a/Dockerfile b/Dockerfile
index 9c7d4d6..f9d216d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,3 +15,12 @@ RUN apt-get -y install nodejs
 
 RUN npm install -g forever nodemon
 RUN npm install -g bower
+RUN rm -rf node_modules || echo no-node_modules
+
+ADD . /project
+
+RUN bash -c "npm install"
+RUN bash -c "bower install --config.interactive=false --allow-root"
+
+EXPOSE 4000
+CMD npm start
diff --git a/bower.json b/bower.json
index 2745bc2..cfd2432 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "Flashlight",
+  "name": "flashlight",
   "description": "",
   "main": "index.js",
   "license": "ISC",
@@ -17,5 +17,9 @@
     "bootstrap-material-design": "~0.5.7",
     "angular-animate": "~1.4.8"
   },
+  "resolutions": {
+    "angular": "1.4.14"
+  },
+
   "homepage": ""
 }
diff --git a/flashlight/config/default.js b/flashlight/config/default.js
index eb42013..1645b44 100644
--- a/flashlight/config/default.js
+++ b/flashlight/config/default.js
@@ -1,5 +1,5 @@
 module.exports = {
-    port: 4000,
+    port: +(process.env.PORT || 4000),
 
     TokenService: {
         key: 'xxxx$$secrettzzzz$$zz'
diff --git a/flashlight/config/dev.js b/flashlight/config/dev.js
index c9299ea..a9276c7 100644
--- a/flashlight/config/dev.js
+++ b/flashlight/config/dev.js
@@ -1,3 +1,3 @@
 module.exports = {
-    port: 3000
+    // port: 3000
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index d608f1c..ee2e546 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "Flashlight",
+  "name": "flashlight",
   "version": "0.0.1",
   "description": "Flashlight",
   "main": "app.js",
   "scripts": {
     "setup": "npm install && bower install --config.interactive=false --allow-root",
-    "start": "npm run setup && nodemon app.js -L -i node_modules/ -i public/",
+    "start": "forever app.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {