diff --git a/cfn/CI.yaml b/cfn/CI.yaml
index 37a46a7d3..a9728bc6d 100644
--- a/cfn/CI.yaml
+++ b/cfn/CI.yaml
@@ -64,131 +64,131 @@ Resources:
         WriteCapacityUnits: "5"
       TableName: !Ref TableName
 
-  BasicTestJavaTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: "partition_key"
-          AttributeType: "S"
-        - AttributeName: "sort_key"
-          AttributeType: "N"
-      KeySchema:
-        - AttributeName: "partition_key"
-          KeyType: "HASH"
-        - AttributeName: "sort_key"
-          KeyType: "RANGE"
-      ProvisionedThroughput:
-        ReadCapacityUnits: "5"
-        WriteCapacityUnits: "5"
-      TableName: !Ref BasicTestJavaTableName
+  #BasicTestJavaTable:
+  #  Type: AWS::DynamoDB::Table
+  #  Properties:
+  #    AttributeDefinitions:
+  #      - AttributeName: "partition_key"
+  #        AttributeType: "S"
+  #      - AttributeName: "sort_key"
+  #        AttributeType: "N"
+  #    KeySchema:
+  #      - AttributeName: "partition_key"
+  #        KeyType: "HASH"
+  #      - AttributeName: "sort_key"
+  #        KeyType: "RANGE"
+  #    ProvisionedThroughput:
+  #      ReadCapacityUnits: "5"
+  #      WriteCapacityUnits: "5"
+  #    TableName: !Ref BasicTestJavaTableName
 
-  BasicTestDotnetTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: "partition_key"
-          AttributeType: "S"
-        - AttributeName: "sort_key"
-          AttributeType: "N"
-      KeySchema:
-        - AttributeName: "partition_key"
-          KeyType: "HASH"
-        - AttributeName: "sort_key"
-          KeyType: "RANGE"
-      ProvisionedThroughput:
-        ReadCapacityUnits: "5"
-        WriteCapacityUnits: "5"
-      TableName: !Ref BasicTestDotNetTableName
+  #BasicTestDotnetTable:
+  #  Type: AWS::DynamoDB::Table
+  #  Properties:
+  #    AttributeDefinitions:
+  #      - AttributeName: "partition_key"
+  #        AttributeType: "S"
+  #      - AttributeName: "sort_key"
+  #        AttributeType: "N"
+  #    KeySchema:
+  #      - AttributeName: "partition_key"
+  #        KeyType: "HASH"
+  #      - AttributeName: "sort_key"
+  #        KeyType: "RANGE"
+  #    ProvisionedThroughput:
+  #      ReadCapacityUnits: "5"
+  #      WriteCapacityUnits: "5"
+  #    TableName: !Ref BasicTestDotnetTableName
 
-  SearchTestJavaTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: "aws_dbe_b_inspector_id_last4"
-          AttributeType: "S"
-        - AttributeName: "aws_dbe_b_last4UnitCompound"
-          AttributeType: "S"
-        - AttributeName: "aws_dbe_b_unit"
-          AttributeType: "S"
-        - AttributeName: "inspection_date"
-          AttributeType: "S"
-        - AttributeName: "work_id"
-          AttributeType: "S"
-      KeySchema:
-        - AttributeName: "work_id"
-          KeyType: "HASH"
-        - AttributeName: "inspection_date"
-          KeyType: "RANGE"
-      ProvisionedThroughput:
-        ReadCapacityUnits: "5"
-        WriteCapacityUnits: "5"
-      TableName: !Ref SearchTestJavaTableName
-      GlobalSecondaryIndexes:
-        - IndexName: "last4-unit-index"
-          KeySchema:
-            - AttributeName: "aws_dbe_b_inspector_id_last4"
-              KeyType: "HASH"
-            - AttributeName: "aws_dbe_b_unit"
-              KeyType: "RANGE"
-          Projection:
-            ProjectionType: ALL
-          ProvisionedThroughput:
-            ReadCapacityUnits: "5"
-            WriteCapacityUnits: "5"
-        - IndexName: "last4UnitCompound-index"
-          KeySchema:
-            - AttributeName: "aws_dbe_b_last4UnitCompound"
-              KeyType: "HASH"
-          Projection:
-            ProjectionType: ALL
-          ProvisionedThroughput:
-            ReadCapacityUnits: "5"
-            WriteCapacityUnits: "5"
+  #SearchTestJavaTable:
+  #  Type: AWS::DynamoDB::Table
+  #  Properties:
+  #    AttributeDefinitions:
+  #      - AttributeName: "aws_dbe_b_inspector_id_last4"
+  #        AttributeType: "S"
+  #      - AttributeName: "aws_dbe_b_last4UnitCompound"
+  #        AttributeType: "S"
+  #      - AttributeName: "aws_dbe_b_unit"
+  #        AttributeType: "S"
+  #      - AttributeName: "inspection_date"
+  #        AttributeType: "S"
+  #      - AttributeName: "work_id"
+  #        AttributeType: "S"
+  #    KeySchema:
+  #      - AttributeName: "work_id"
+  #        KeyType: "HASH"
+  #      - AttributeName: "inspection_date"
+  #        KeyType: "RANGE"
+  #    ProvisionedThroughput:
+  #      ReadCapacityUnits: "5"
+  #      WriteCapacityUnits: "5"
+  #    TableName: !Ref SearchTestJavaTableName
+  #    GlobalSecondaryIndexes:
+  #      - IndexName: "last4-unit-index"
+  #        KeySchema:
+  #          - AttributeName: "aws_dbe_b_inspector_id_last4"
+  #            KeyType: "HASH"
+  #          - AttributeName: "aws_dbe_b_unit"
+  #            KeyType: "RANGE"
+  #        Projection:
+  #          ProjectionType: ALL
+  #        ProvisionedThroughput:
+  #          ReadCapacityUnits: "5"
+  #          WriteCapacityUnits: "5"
+  #      - IndexName: "last4UnitCompound-index"
+  #        KeySchema:
+  #          - AttributeName: "aws_dbe_b_last4UnitCompound"
+  #            KeyType: "HASH"
+  #        Projection:
+  #          ProjectionType: ALL
+  #        ProvisionedThroughput:
+  #          ReadCapacityUnits: "5"
+  #          WriteCapacityUnits: "5"
 
-  SearchTestDotnetTable:
-    Type: AWS::DynamoDB::Table
-    Properties:
-      AttributeDefinitions:
-        - AttributeName: "aws_dbe_b_inspector_id_last4"
-          AttributeType: "S"
-        - AttributeName: "aws_dbe_b_last4UnitCompound"
-          AttributeType: "S"
-        - AttributeName: "aws_dbe_b_unit"
-          AttributeType: "S"
-        - AttributeName: "inspection_date"
-          AttributeType: "S"
-        - AttributeName: "work_id"
-          AttributeType: "S"
-      KeySchema:
-        - AttributeName: "work_id"
-          KeyType: "HASH"
-        - AttributeName: "inspection_date"
-          KeyType: "RANGE"
-      ProvisionedThroughput:
-        ReadCapacityUnits: "5"
-        WriteCapacityUnits: "5"
-      TableName: !Ref SearchTestDotnetTableName
-      GlobalSecondaryIndexes:
-        - IndexName: "last4-unit-index"
-          KeySchema:
-            - AttributeName: "aws_dbe_b_inspector_id_last4"
-              KeyType: "HASH"
-            - AttributeName: "aws_dbe_b_unit"
-              KeyType: "RANGE"
-          Projection:
-            ProjectionType: ALL
-          ProvisionedThroughput:
-            ReadCapacityUnits: "5"
-            WriteCapacityUnits: "5"
-        - IndexName: "last4UnitCompound-index"
-          KeySchema:
-            - AttributeName: "aws_dbe_b_last4UnitCompound"
-              KeyType: "HASH"
-          Projection:
-            ProjectionType: ALL
-          ProvisionedThroughput:
-            ReadCapacityUnits: "5"
-            WriteCapacityUnits: "5"
+  #SearchTestDotnetTable:
+  #  Type: AWS::DynamoDB::Table
+  #  Properties:
+  #    AttributeDefinitions:
+  #      - AttributeName: "aws_dbe_b_inspector_id_last4"
+  #        AttributeType: "S"
+  #      - AttributeName: "aws_dbe_b_last4UnitCompound"
+  #        AttributeType: "S"
+  #      - AttributeName: "aws_dbe_b_unit"
+  #        AttributeType: "S"
+  #      - AttributeName: "inspection_date"
+  #        AttributeType: "S"
+  #      - AttributeName: "work_id"
+  #        AttributeType: "S"
+  #    KeySchema:
+  #      - AttributeName: "work_id"
+  #        KeyType: "HASH"
+  #      - AttributeName: "inspection_date"
+  #        KeyType: "RANGE"
+  #    ProvisionedThroughput:
+  #      ReadCapacityUnits: "5"
+  #      WriteCapacityUnits: "5"
+  #    TableName: !Ref SearchTestDotnetTableName
+  #    GlobalSecondaryIndexes:
+  #      - IndexName: "last4-unit-index"
+  #        KeySchema:
+  #          - AttributeName: "aws_dbe_b_inspector_id_last4"
+  #            KeyType: "HASH"
+  #          - AttributeName: "aws_dbe_b_unit"
+  #            KeyType: "RANGE"
+  #        Projection:
+  #          ProjectionType: ALL
+  #        ProvisionedThroughput:
+  #          ReadCapacityUnits: "5"
+  #          WriteCapacityUnits: "5"
+  #      - IndexName: "last4UnitCompound-index"
+  #        KeySchema:
+  #          - AttributeName: "aws_dbe_b_last4UnitCompound"
+  #            KeyType: "HASH"
+  #        Projection:
+  #          ProjectionType: ALL
+  #        ProvisionedThroughput:
+  #          ReadCapacityUnits: "5"
+  #          WriteCapacityUnits: "5"
 
   TestTableWithSimpleBeaconIndex:
     Type: AWS::DynamoDB::Table
@@ -384,7 +384,7 @@ Resources:
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${KeystoreTableName}"
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${KeystoreTableName}/index/*"
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${BasicTestJavaTableName}"
-              - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${BasicTestDotNetTableName}"
+              - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${BasicTestDotnetTableName}"
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestJavaTableName}"
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestJavaTableName}/index/*"
               - !Sub "arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${SearchTestDotnetTableName}"