diff --git a/state/rds-aurora-serverless.yaml b/state/rds-aurora-serverless.yaml
index 3ee101469..578b9c3b9 100644
--- a/state/rds-aurora-serverless.yaml
+++ b/state/rds-aurora-serverless.yaml
@@ -139,8 +139,12 @@ Mappings:
   EngineVersionMap:
     '5.6.10a':
       ClusterParameterGroupFamily: 'aurora5.6'
+      EngineVersion: '5.6.10a'
+      Engine: aurora
     '5.7.mysql-aurora.2.07.1':
       ClusterParameterGroupFamily: 'aurora-mysql5.7'
+      EngineVersion: '5.7.mysql_aurora.2.07.1'
+      Engine: 'aurora-mysql'
 Conditions:
   HasZone: !Not [!Equals [!Ref ParentZoneStack, '']]
   HasSSHBastionSecurityGroup: !Not [!Equals [!Ref ParentSSHBastionStack, '']]
@@ -209,9 +213,9 @@ Resources:
       DBClusterParameterGroupName: !Ref DBClusterParameterGroup
       DBSubnetGroupName: !Ref DBSubnetGroup
       EnableHttpEndpoint: !Ref EnableDataApi
-      Engine: aurora
+      Engine: !FindInMap [EngineVersionMap, !Ref EngineVersion, Engine]
       EngineMode: serverless
-      EngineVersion: !Ref EngineVersion
+      EngineVersion: !FindInMap [EngineVersionMap, !Ref EngineVersion, EngineVersion]
       KmsKeyId: !If [HasDBSnapshotIdentifier, !Ref 'AWS::NoValue', {'Fn::ImportValue': !Sub '${ParentKmsKeyStack}-KeyArn'}]
       MasterUsername: !If [HasDBSnapshotIdentifier, !Ref 'AWS::NoValue', !Ref DBMasterUsername]
       MasterUserPassword: !If [HasDBSnapshotIdentifier, !Ref 'AWS::NoValue', !Ref DBMasterUserPassword]