diff --git a/src/flextype/config/settings.yaml b/src/flextype/config/settings.yaml
index be8d51d8..20150f7d 100644
--- a/src/flextype/config/settings.yaml
+++ b/src/flextype/config/settings.yaml
@@ -189,12 +189,17 @@ image:
 
 # API's
 api:
-  images:
-    enabled: true
-    default_token:
-  entries:
-    enabled: true
-    default_token:
-  registry:
-    enabled: true
-    default_token:
+  delivery:
+    images:
+      enabled: true
+      default_token:
+    entries:
+      enabled: true
+      default_token:
+    registry:
+      enabled: true
+      default_token:
+  management:
+    entries:
+      enabled: true
+      default_token:
diff --git a/src/flextype/endpoints/delivery/entries.php b/src/flextype/endpoints/delivery/entries.php
index 2141a030..972101d5 100644
--- a/src/flextype/endpoints/delivery/entries.php
+++ b/src/flextype/endpoints/delivery/entries.php
@@ -46,7 +46,8 @@ $app->get('/api/delivery/entries', function (Request $request, Response $respons
     $token  = $query['token'];
     $filter = $query['filter'] ?? null;
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.delivery.entries.enabled')) {
+
         // Validate delivery token
         if (validate_delivery_entries_token($token)) {
             $delivery_entries_token_file_path = PATH['site'] . '/tokens/delivery/entries/' . $token. '/token.yaml';
diff --git a/src/flextype/endpoints/delivery/images.php b/src/flextype/endpoints/delivery/images.php
index 195daa8a..9befbe85 100644
--- a/src/flextype/endpoints/delivery/images.php
+++ b/src/flextype/endpoints/delivery/images.php
@@ -45,7 +45,7 @@ $app->get('/api/delivery/images/{path:.+}', function (Request $request, Response
     // Set variables
     $token = $query['token'];
 
-    if ($flextype['registry']->get('flextype.settings.api.images.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.delivery.images.enabled')) {
 
         // Validate delivery image token
         if (validate_delivery_images_token($token)) {
diff --git a/src/flextype/endpoints/delivery/registry.php b/src/flextype/endpoints/delivery/registry.php
index ca261529..5826e773 100644
--- a/src/flextype/endpoints/delivery/registry.php
+++ b/src/flextype/endpoints/delivery/registry.php
@@ -43,7 +43,7 @@ $app->get('/api/delivery/registry', function (Request $request, Response $respon
     $id    = $query['id'];
     $token = $query['token'];
 
-    if ($flextype['registry']->get('flextype.settings.api.registry.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.delivery.registry.enabled')) {
 
         // Validate delivery token
         if (validate_delivery_registry_token($token)) {
diff --git a/src/flextype/endpoints/management/entries.php b/src/flextype/endpoints/management/entries.php
index 65757db2..d387a2f7 100644
--- a/src/flextype/endpoints/management/entries.php
+++ b/src/flextype/endpoints/management/entries.php
@@ -53,7 +53,7 @@ $app->get('/api/management/entries', function (Request $request, Response $respo
     $token  = $query['token'];
     $filter = $query['filter'] ?? null;
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
         // Validate management token
         if (validate_management_entries_token($token)) {
             $management_entries_token_file_path = PATH['site'] . '/tokens/management/entries/' . $token. '/token.yaml';
@@ -121,7 +121,7 @@ $app->post('/api/management/entries', function (Request $request, Response $resp
     $id           = $post_data['id'];
     $data         = $post_data['data'];
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
 
         // Validate management and auth token
         if (validate_management_entries_token($token) && validate_access_token($access_token)) {
@@ -203,7 +203,7 @@ $app->patch('/api/management/entries', function (Request $request, Response $res
     $id           = $post_data['id'];
     $data         = $post_data['data'];
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
 
         // Validate management and auth token
         if (validate_management_entries_token($token) && validate_access_token($access_token)) {
@@ -285,7 +285,7 @@ $app->put('/api/management/entries', function (Request $request, Response $respo
     $id            = $post_data['id'];
     $new_id        = $post_data['new_id'];
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
 
         // Validate management and auth token
         if (validate_management_entries_token($token) && validate_access_token($access_token)) {
@@ -368,7 +368,7 @@ $app->put('/api/management/entries/copy', function (Request $request, Response $
     $id           = $post_data['id'];
     $new_id       = $post_data['new_id'];
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
 
         // Validate management and auth token
         if (validate_management_entries_token($token) && validate_access_token($access_token)) {
@@ -449,7 +449,7 @@ $app->delete('/api/management/entries', function (Request $request, Response $re
     $access_token = $post_data['access_token'];
     $id           = $post_data['id'];
 
-    if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
+    if ($flextype['registry']->get('flextype.settings.api.management.entries.enabled')) {
 
         // Validate management and auth token
         if (validate_management_entries_token($token) && validate_access_token($access_token)) {