diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..a180c3c0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Desktop (please complete the following information):**
+ - `GHC` version:
+ - `io-sim` version:
+ - `io-classes` version:
+
+**Additional context**
+Add any other context about the problem here. Attach `io-sim` or `io-sim-por` trace if possible.
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 00000000..ed7b1493
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Questions
+    url: https://github.com/input-output-hk/io-sim/discussions
+    about: Please raise any questions in Discussions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..b38bed15
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Are you willing to implement it?**
+* [ ] Are you? :smiley:
diff --git a/cabal.project b/cabal.project
index 727113c8..8d48d67d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -16,8 +16,8 @@ package strict-stm
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/typed-protocols
-  tag: aa570239bf1ed7303b730317e89d9a80d214ad38
-  --sha256: 0vfn0cdschyfc9j7cbbmxls0yq588xg2vmsf10bx6wgpxf9wkd2m
+  tag: 254a4f8520ff58bb80bf1468d279391c6002436e
+  --sha256: 1jpdlks39s9yih96kadzb6va0ag7c1l9510a0q98bj7gksng4218
   subdir:
     typed-protocols
     typed-protocols-cborg