diff --git a/.firebaserc b/.firebaserc
new file mode 100644
index 0000000..86c8610
--- /dev/null
+++ b/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "fmartingrcom"
+  }
+}
diff --git a/.gitignore b/.gitignore
index 7deee4e..6120eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ assets/static/css
 
 # Tests
 tests/venv
+
+# Build
+public
\ No newline at end of file
diff --git a/Felipe Martin.lektorproject b/Felipe Martin.lektorproject
index 113e210..b46899a 100644
--- a/Felipe Martin.lektorproject	
+++ b/Felipe Martin.lektorproject	
@@ -6,6 +6,3 @@ url_style = absolute
 [packages]
 lektor-markdown-highlighter = 0.1
 lektor-atom = 0.2
-
-[servers.production]
-target = rsync://fmartingrcom@static-1.scaleway.fra1.ops.fmartingr.com/var/www/fmartingr.com/html
diff --git a/Makefile b/Makefile
index c952b26..d86b52e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ dev:
 
 build:
 	make dev
-	lektor build
+	lektor build --output-path ./public
 
 watch:
 	node_modules/gulp/bin/gulp.js sass:watch
 
 deploy:
 	make build
-	lektor deploy
+	node_modules/firebase-tools/bin/firebase deploy
 
 deploy_tests:
 	bash tests/run.sh
diff --git a/firebase.json b/firebase.json
new file mode 100644
index 0000000..9c1c0c9
--- /dev/null
+++ b/firebase.json
@@ -0,0 +1,5 @@
+{
+  "hosting": {
+    "public": "public"
+  }
+}
diff --git a/package.json b/package.json
index 64cbae6..d3696b8 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "fmartingr.com",
   "main": "gulpfile.js",
   "devDependencies": {
+    "firebase-tools": "^3.2.1",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
     "gulp-concat-css": "^2.2.0",