diff --git a/app/models.py b/app/models.py
index 5df7730bf..9fdca45de 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1805,12 +1805,12 @@ class FactBilling(db.Model):
 
     bst_date = db.Column(db.Date, nullable=False, primary_key=True, index=True)
     template_id = db.Column(UUID(as_uuid=True), nullable=False, primary_key=True, index=True)
-    service_id = db.Column(UUID(as_uuid=True), nullable=False, index=True)
+    service_id = db.Column(UUID(as_uuid=True), nullable=False, primary_key=True, index=True)
     notification_type = db.Column(db.Text, nullable=False, primary_key=True)
-    provider = db.Column(db.Text, nullable=True, primary_key=True)
-    rate_multiplier = db.Column(db.Integer(), nullable=True, primary_key=True)
-    international = db.Column(db.Boolean, nullable=False, primary_key=False)
-    rate = db.Column(db.Numeric(), nullable=False)
+    provider = db.Column(db.Text, nullable=False, primary_key=True)
+    rate_multiplier = db.Column(db.Integer(), nullable=False, primary_key=True)
+    international = db.Column(db.Boolean, nullable=False, primary_key=True)
+    rate = db.Column(db.Numeric(), nullable=False, primary_key=True)
     billable_units = db.Column(db.Integer(), nullable=True)
     notifications_sent = db.Column(db.Integer(), nullable=True)
     created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)