diff --git a/webapp/migrations/0061_auto_20191110_1923.py b/webapp/migrations/0061_auto_20191110_1923.py
new file mode 100644
index 0000000..9c22578
--- /dev/null
+++ b/webapp/migrations/0061_auto_20191110_1923.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.1.5 on 2019-11-10 17:23
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0060_official_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='official',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to=''),
+        ),
+        migrations.AlterField(
+            model_name='signupform',
+            name='questions',
+            field=django.contrib.postgres.fields.jsonb.JSONField(),
+        ),
+        migrations.AlterField(
+            model_name='templatequestion',
+            name='question',
+            field=django.contrib.postgres.fields.jsonb.JSONField(),
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index 520af45..16a4e63 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -2,7 +2,6 @@
 
 from django.db import models
 from django.utils import timezone
-# from datetime import timedelta
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -10,9 +9,7 @@ from webapp.utils import month_from_now
 from django.utils.translation import ugettext_lazy as _
 from auditlog.registry import auditlog
 from phonenumber_field.modelfields import PhoneNumberField
-# from django.contrib.postgres.fields import JSONField
-
-# import logging
+from django.contrib.postgres.fields import JSONField
 
 
 VERBOSE_NAME = _('Webapp')
@@ -77,9 +74,8 @@ class Event(BaseFeed):
 
 class TemplateQuestion(models.Model):
     """Stores template questions for signup forms as JSONB"""
-    # question = JSONField()
     name = models.CharField(max_length=255)
-    question = models.CharField(max_length=255)
+    question = JSONField()
 
     def __str__(self):
         return _('Template questions: {}').format(self.name)
@@ -95,8 +91,7 @@ class SignupForm(models.Model):
     title = models.CharField(max_length=255)
     start_time = models.DateTimeField(default=timezone.now)
     end_time = models.DateTimeField(default=timezone.now)
-    # question = JSONField()
-    questions = models.TextField(default="[]")
+    questions = JSONField()
     visible = models.BooleanField(default=True)
 
     def __str__(self):