diff --git a/app/main/forms.py b/app/main/forms.py
index e5a084cd7..4dcf5818e 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -602,7 +602,7 @@ class CreateServiceForm(StripWhitespaceForm):
 class CreateNhsServiceForm(CreateServiceForm):
     organisation_type = OrganisationTypeField(
         'Who runs this service?',
-        include_only={'nhs_central', 'nhs_local'}
+        include_only={'nhs_central', 'nhs_local', 'nhs_gp'},
     )
 
 
diff --git a/app/models/organisation.py b/app/models/organisation.py
index 960b38b5f..7ca83be26 100644
--- a/app/models/organisation.py
+++ b/app/models/organisation.py
@@ -12,7 +12,7 @@ class Organisation(JSONModel):
         ('local', 'Local government'),
         ('nhs_central', 'NHS – central government agency or public body'),
         ('nhs_local', 'NHS Trust or Clinical Commissioning Group'),
-        ('nhs_local', 'GP practice'),
+        ('nhs_gp', 'GP practice'),
         ('emergency_service', 'Emergency service'),
         ('school_or_college', 'School or college'),
         ('other', 'Other'),
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index cd7cd37fb..9a9817783 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -92,7 +92,7 @@ def test_page_to_create_new_organisation(
         ('radio', 'organisation_type', 'local'),
         ('radio', 'organisation_type', 'nhs_central'),
         ('radio', 'organisation_type', 'nhs_local'),
-        ('radio', 'organisation_type', 'nhs_local'),
+        ('radio', 'organisation_type', 'nhs_gp'),
         ('radio', 'organisation_type', 'emergency_service'),
         ('radio', 'organisation_type', 'school_or_college'),
         ('radio', 'organisation_type', 'other'),
@@ -282,7 +282,7 @@ def test_organisation_settings_for_platform_admin(
             ('local', 'Local government'),
             ('nhs_central', 'NHS – central government agency or public body'),
             ('nhs_local', 'NHS Trust or Clinical Commissioning Group'),
-            ('nhs_local', 'GP practice'),
+            ('nhs_gp', 'GP practice'),
             ('emergency_service', 'Emergency service'),
             ('school_or_college', 'School or college'),
             ('other', 'Other'),
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index 2a6910067..539a80132 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -55,7 +55,7 @@ def test_get_should_render_add_service_template(
         'local',
         'nhs_central',
         'nhs_local',
-        'nhs_local',
+        'nhs_gp',
         'emergency_service',
         'school_or_college',
         'other',
@@ -205,7 +205,7 @@ def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
     ] == [
         'nhs_central',
         'nhs_local',
-        'nhs_local',
+        'nhs_gp',
     ]