diff --git a/.cfnlintrc b/.cfnlintrc
new file mode 100644
index 00000000..e286701e
--- /dev/null
+++ b/.cfnlintrc
@@ -0,0 +1,2 @@
+ignore_checks:
+  - W3002
\ No newline at end of file
diff --git a/apps/collection/template.yaml b/apps/collection/template.yaml
index 361527dc..4c794298 100644
--- a/apps/collection/template.yaml
+++ b/apps/collection/template.yaml
@@ -140,9 +140,7 @@ Resources:
   Forwarder:
     Type: AWS::Serverless::Application
     Properties:
-      Location:
-        ApplicationId: arn:aws:serverlessrepo:us-east-1:739672403694:applications/observe-forwarder
-        SemanticVersion: 0.0.5
+      Location: ../forwarder/template.yaml
       NotificationARNs:
         - !Ref Topic
       Parameters:
@@ -181,9 +179,7 @@ Resources:
     DependsOn: Forwarder
     Condition: EnableConfig
     Properties:
-      Location:
-        ApplicationId: arn:aws:serverlessrepo:us-east-1:739672403694:applications/observe-aws-config
-        SemanticVersion: 0.0.4
+      Location: ../config/template.yaml
       NotificationARNs:
         - !Ref Topic
       Parameters: