diff --git a/.firebaserc b/.firebaserc
index 088e7b4..19797cb 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,5 +1,17 @@
 {
   "projects": {
     "default": "badgen-service"
+  },
+  "targets": {
+    "badgen-service": {
+      "hosting": {
+        "flat-badgen": [
+          "flat-badgen"
+        ],
+        "badgen": [
+          "badgen"
+        ]
+      }
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/firebase.json b/firebase.json
index 7278def..4f4fc3a 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,10 +1,8 @@
 {
-  "hosting": {
+  "hosting": [ {
+    "target": "badgen",
     "public": "dist",
     "ignore": [
-      "libs",
-      "endpoints",
-      "index.js*",
       "**/*"
     ],
     "rewrites": [ {
@@ -13,19 +11,19 @@
         "serviceId": "badgen",
         "region": "us-central1"
       }
-    } ],
-    "headers": [ {
-      "source" : "**/*.@(eot|otf|ttf|ttc|woff|font.css)",
-      "headers" : [ {
-        "key" : "Access-Control-Allow-Origin",
-        "value" : "*"
-      } ]
-      }, {
-      "source" : "**/*.@(svg|png)",
-      "headers" : [ {
-        "key" : "Cache-Control",
-        "value" : "max-age=86400"
-      } ]
     } ]
-  }
+  }, {
+    "target": "flat-badgen",
+    "public": "dist",
+    "ignore": [
+      "**/*"
+    ],
+    "rewrites": [ {
+      "source": "**",
+      "run": {
+        "serviceId": "badgen-flat",
+        "region": "us-central1"
+      }
+    } ]
+  } ]
 }