diff --git a/.github/ISSUE_TEMPLATE/application-note-not-compliant.md b/.github/ISSUE_TEMPLATE/application-note-not-compliant.md
deleted file mode 100644
index 90723cb..0000000
--- a/.github/ISSUE_TEMPLATE/application-note-not-compliant.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Application Note Issue
-about: Template for an Application note issue report
-title: examples/ANXXXXX Application Note not compliant
-labels: documentation
-assignees: ''
-
----
-
-<!--- Update the title with the path of the AN -->
-
-<!--- Update the issues below -->
-**Issues:**
-
- - xdoc-custom RST directives used in the Application Note README
- - application note code not compiling for xcore-ai
- - application note code not running successfully on xcore-ai
diff --git a/.github/ISSUE_TEMPLATE/example-not-compliant.md b/.github/ISSUE_TEMPLATE/example-not-compliant.md
deleted file mode 100644
index 5e68cdb..0000000
--- a/.github/ISSUE_TEMPLATE/example-not-compliant.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Example Issue
-about: Template for an example issue report
-title: examples/xxx Example not compliant
-labels: documentation
-assignees: ''
-
----
-
-<!--- Update the title with the path of the example -->
-
-<!--- Update the issues below -->
-**Issues:**
-
- - convert example to Application Note
- - xdoc-custom RST directives used in the README
- - example code not compiling for xcore-ai
- - example code not running successfully on xcore-ai
diff --git a/.github/ISSUE_TEMPLATE/missing-application-note.md b/.github/ISSUE_TEMPLATE/missing-application-note.md
deleted file mode 100644
index 9404dde..0000000
--- a/.github/ISSUE_TEMPLATE/missing-application-note.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Missing Application Note
-about: Template for a Missing Application Note issue report
-title: Missing Application Note
-labels: documentation
-assignees: ''
-
----
-
-<!--- Describe the status of the existing examples -->
diff --git a/.github/ISSUE_TEMPLATE/missing-c-api.md b/.github/ISSUE_TEMPLATE/missing-c-api.md
deleted file mode 100644
index 6230ef7..0000000
--- a/.github/ISSUE_TEMPLATE/missing-c-api.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Missing C API Issue
-about: Template for a Missing C API issue report
-title: Missing C API
-labels: enhancement
-assignees: ''
-
----
-
-<!--- Describe the status of the existing API -->
diff --git a/.github/ISSUE_TEMPLATE/missing-xcore-test.md b/.github/ISSUE_TEMPLATE/missing-xcore-test.md
deleted file mode 100644
index 866e97c..0000000
--- a/.github/ISSUE_TEMPLATE/missing-xcore-test.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Missing xCore Test Issue
-about: Template for a Missing xCore test issue report
-title: Missing xCore test
-labels: testing
-assignees: ''
-
----
-
-<!--- Describe the status of the existing tests -->
diff --git a/.github/ISSUE_TEMPLATE/test-not-compliant.md b/.github/ISSUE_TEMPLATE/test-not-compliant.md
deleted file mode 100644
index cce3e91..0000000
--- a/.github/ISSUE_TEMPLATE/test-not-compliant.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: Test Issue
-about: Template for a Test issue report
-title: tests/XXX does not build or fails
-labels: testing
-assignees: ''
-
----
-
-<!--- Update the title of the issue with the path of the test -->
-
-<!--- Update the issues below -->
-**Issues:**
-
- - Test not compiling for xcore-ai
- - Test not running successfully on xcore-ai
diff --git a/.github/ISSUE_TEMPLATE/top-level-readme-not-compliant.md b/.github/ISSUE_TEMPLATE/top-level-readme-not-compliant.md
deleted file mode 100644
index 931414c..0000000
--- a/.github/ISSUE_TEMPLATE/top-level-readme-not-compliant.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Top-level README Issue
-about: Template for the top-level README issue report
-title: Top-level README not compliant
-labels: documentation
-assignees: ''
-
----
-
-<!--- Update the issues below -->
-**Issues:**
-
- - xdoc-custom RST directives used in the README
diff --git a/.gitignore b/.gitignore
index ab417e1..06ab964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,42 @@
-**/.build*/*
-**/bin/*
-*.o
-*.xe
+# Tmp files & logs
+*.settings
+*.bin
+*.zip
+*.log
 *.vcd
-*.s
+*.swp
+*.*~
+*.xmt
+*.swo
+*.swn
+*~
+*.DS_Store
+
+# Python
+*.pyc
+**/*.egg-info/
+**/.venv*/
+
+# XMOS temp files
+**/*build*/*
+*/bin/*
+**/flash_bin_node*
+**/fw-*
+**/s2l-*
+**/spanning-xn-*
+**/target-xn*
 *.xi
+*.o
 *.i
 *.a
-**/_build/
-**/run_*.log
-**/pdf/*
-**/html/*
-**/.settings/*
-*.pyc
-**/test_results.csv
-**/.venv/**
+*.d
+*.decouple
+*.pca.xml
+**/CMakeFiles/*
+
+# XMOS binaries
+*.xe
 
-# waf build files
-.lock-waf_*
-.waf-*/
-build/
+# Built documentation
+doc/_build/pdf/*.pdf
+**/doc/pdf/*.pdf
diff --git a/Jenkinsfile b/Jenkinsfile
index bc287ae..01137c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,6 +25,11 @@ pipeline {
       defaultValue: 'v6.1.2',
       description: 'The xmosdoc version'
     )
+    string(
+      name: 'INFR_APPS_VERSION',
+      defaultValue: 'v2.0.1',
+      description: 'The infr_apps version'
+    )
   }
   stages {
     stage('Build') {
@@ -49,7 +54,7 @@ pipeline {
                 buildDocs()
               }
             }
-            runLibraryChecks("${WORKSPACE}/${REPO}", "v2.0.1")
+            runLibraryChecks("${WORKSPACE}/${REPO}", "${params.INFR_APPS_VERSION}")
           }
         }
       }