diff --git a/deckhand/engine/schema/v1_0/default_schema.py b/deckhand/engine/schema/v1_0/default_schema.py
index f2402e6b..221ceb7b 100644
--- a/deckhand/engine/schema/v1_0/default_schema.py
+++ b/deckhand/engine/schema/v1_0/default_schema.py
@@ -39,13 +39,11 @@ schema = {
     'properties': {
         'apiVersion': {
             'type': 'string',
-            # TODO(fm577c): These should be enumerated.
-            'choices': ['service/v1']
+            'pattern': '^([A-Za-z]+\/v[0-9]{1})$'
         },
         'kind': {
             'type': 'string',
-            # TODO(fm577c): These should be enumerated.
-            'choices': ['ConsumerOfCertificateData']
+            'pattern': '^([A-Za-z]+$'
         },
         'metadata': {
             'type': 'object',
diff --git a/deckhand/engine/secret_substitution.py b/deckhand/engine/secret_substitution.py
index dead4e93..b959dcf7 100644
--- a/deckhand/engine/secret_substitution.py
+++ b/deckhand/engine/secret_substitution.py
@@ -16,12 +16,12 @@ import yaml
 
 import jsonschema
 
-from deckhand import errors
 from deckhand.engine.schema.v1_0 import default_schema
+from deckhand import errors
 
 
 class SecretSubstitution(object):
-    """Initialization of class for secret substitution logic for YAML files.
+    """Class for secret substitution logic for YAML files.
 
     This class is responsible for parsing, validating and retrieving secret
     values for values stored in the YAML file. Afterward, secret values will be
@@ -42,8 +42,26 @@ class SecretSubstitution(object):
 
         self.validate_data()
 
+    class SchemaVersion(object):
+        """Class for retrieving correct schema for pre-validation on YAML.
+
+        Retrieves the schema that corresponds to "apiVersion" in the YAML
+        data. This schema is responsible for performing pre-validation on
+        YAML data.
+        """
+
+        schema_versions_info = [{'version': 'v1', 'schema': default_schema}]
+
+        def __init__(self, schema_version):
+            self.schema_version = schema_version
+
+        @property
+        def schema(self):
+            return [v['schema'] for v in self.schema_versions_info
+                    if v['version'] == self.schema_version][0].schema
+
     def validate_data(self):
-        """Validate that the YAML file is correctly formatted.
+        """Pre-validate that the YAML file is correctly formatted.
 
         The YAML file must adhere to the following bare minimum format:
 
@@ -70,11 +88,7 @@ class SecretSubstitution(object):
                   certificate: null  # Data to be substituted.
                   certificateKey: null  # Data to be substituted.
         """
-        try:
-            jsonschema.validate(self.data, default_schema.schema)
-        except jsonschema.exceptions.ValidationError as e:
-            raise errors.InvalidFormat('The provided YAML file is invalid. '
-                                       'Exception: %s.' % e.message)
+        self._validate_with_schema()
 
         # Validate that each "dest" field exists in the YAML data.
         substitutions = self.data['metadata']['substitutions']
@@ -91,6 +105,22 @@ class SecretSubstitution(object):
 
         # TODO(fm577c): Query Deckhand API to validate "src" values.
 
+    def _validate_with_schema(self):
+        # Validate that a schema with "apiVersion" version number exists, then
+        # use that schema to validate the YAML data.
+        try:
+            schema_version = self.data['apiVersion'].split('/')[-1]
+            data_schema_version = self.SchemaVersion(schema_version)
+        except (AttributeError, IndexError, KeyError) as e:
+            raise errors.InvalidFormat(
+                'The provided apiVersion is invalid or missing. Exception: %s.'
+                % e)
+        try:
+            jsonschema.validate(self.data, data_schema_version.schema)
+        except jsonschema.exceptions.ValidationError as e:
+            raise errors.InvalidFormat('The provided YAML file is invalid. '
+                                       'Exception: %s.' % e.message)
+
     def _multi_getattr(self, multi_key, substitutable_data):
         """Iteratively check for nested attributes in the YAML data.
 
diff --git a/deckhand/tests/unit/engine/test_secret_substitution.py b/deckhand/tests/unit/engine/test_secret_substitution.py
index 3277ac68..3e3eccbb 100644
--- a/deckhand/tests/unit/engine/test_secret_substitution.py
+++ b/deckhand/tests/unit/engine/test_secret_substitution.py
@@ -17,7 +17,6 @@ import os
 import testtools
 import yaml
 
-from oslo_serialization import jsonutils as json
 import six
 
 from deckhand.engine import secret_substitution
@@ -36,7 +35,7 @@ class TestSecretSubtitution(testtools.TestCase):
             yaml_data = yaml_file.read()
         self.data = yaml.safe_load(yaml_data)
 
-    def _corrupt_data(self, key):
+    def _corrupt_data(self, key, data=None):
         """Corrupt test data to check that pre-validation works.
 
         Corrupt data by removing a key from the document. Each key must
@@ -50,7 +49,9 @@ class TestSecretSubtitution(testtools.TestCase):
                    document['metadata']['substitutions'][0].pop('dest')
         :returns: Corrupted YAML data.
         """
-        corrupted_data = copy.deepcopy(self.data)
+        if data is None:
+            data = self.data
+        corrupted_data = copy.deepcopy(data)
 
         if '.' in key:
             _corrupted_data = corrupted_data