diff --git a/src/OperationType/GenericType/AbstractModelFormBase.php b/src/OperationType/GenericType/AbstractModelFormBase.php
index 49e27ea2ce7dd69e9c691441798a102d9e5ed92b..70867d9de69cd1083a8bc2f5f60f97539729bec2 100644
--- a/src/OperationType/GenericType/AbstractModelFormBase.php
+++ b/src/OperationType/GenericType/AbstractModelFormBase.php
@@ -75,6 +75,15 @@ abstract class AbstractModelFormBase implements ModelFormInterface {
       '#weight' => 3,
     ];
 
+    $form['model_data']['datastore'] = [
+      '#type' => 'textfield',
+      '#title' => t('Datastore'),
+      '#description' => t('Optional datastore identifier.'),
+      '#default_value' => $config['datastore'] ?? '',
+      '#weight' => 4,
+      '#required' => FALSE,
+    ];
+
     $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $config['new_model'] ? t('Create Model') : t('Save Model'),
@@ -107,6 +116,7 @@ abstract class AbstractModelFormBase implements ModelFormInterface {
     $form_state->setRebuild();
     $form['model_data']['label']['#value'] = $model['label'] ?? '';
     $form['model_data']['model_id']['#value'] = $form_state->getValue('base_on');
+    $form['model_data']['datastore']['#value'] = $model['datastore'] ?? '';
     // Unset all checkboxes before setting them.
     foreach ($form['model_data'] as $key => $element) {
       if (is_array($element) && $element['#type'] === 'checkbox') {