diff --git a/.idea/README.md b/.idea/README.md
new file mode 100644
index 000000000..791237770
--- /dev/null
+++ b/.idea/README.md
@@ -0,0 +1,10 @@
+# Spinnaker IntelliJ IDEA files
+
+IntelliJ IDEA will modify some of these files from their checked-in versions when the project is
+opened. To work around this, the Spinnaker Gradle plugin will mark these files in Git as "assume
+unchanged", telling Git to ignore any local changes. If you want to commit changes to these files,
+you will need to undo that.
+
+```bash
+$ git update-index --no-assume-unchanged $FILENAME
+``` 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..a1757ae52
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/ALS2.xml b/.idea/copyright/ALS2.xml
new file mode 100644
index 000000000..2f6849bb3
--- /dev/null
+++ b/.idea/copyright/ALS2.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright &amp;#36;today.year Netflix, Inc.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;  http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License.&#10;" />
+    <option name="myName" value="ALS2" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..5c6994bea
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="ALS2" />
+</component>
\ No newline at end of file
diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml
new file mode 100644
index 000000000..4a0e553c7
--- /dev/null
+++ b/.idea/google-java-format.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoogleJavaFormatSettings">
+    <option name="state" value="ENABLED" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..4aa6c33c7
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="useAutoImport" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..35eb1ddfb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index dfab9b17f..7e3236bb8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,5 +2,5 @@
 fiatVersion=1.1.0
 enablePublishing=false
 korkVersion=5.5.2
-spinnakerGradleVersion=6.5.0
+spinnakerGradleVersion=6.7.0
 org.gradle.parallel=true