diff --git a/.gitignore b/.gitignore
index da0baf3e66..a651ba5cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ pom.xml
 node_modules
 /backend/.cpcache
 /backend/target/
-/backend/resources/media
+/backend/resources/public/media
 /backend/dist/
 /backend/-
 /backend/.rebel_readline_history
diff --git a/backend/src/uxbox/cli/collimp.clj b/backend/src/uxbox/cli/collimp.clj
index 28eed06d61..3c48932de3 100644
--- a/backend/src/uxbox/cli/collimp.clj
+++ b/backend/src/uxbox/cli/collimp.clj
@@ -198,7 +198,8 @@
 
 (defn- start-system
   []
-  (mount/start))
+  (-> (mount/except #{#'uxbox.http/server})
+      (mount/start)))
 
 (defn- stop-system
   []