diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ad6d10..b1c231b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
 
 ## Latest
 
+- [Bugfix] Fix missing templates in bundled plugins
 - [Bugfix] Enable html certificate view
 
 ## 3.6.1 (2019-07-27)
diff --git a/plugins/minio/MANIFEST.in b/plugins/minio/MANIFEST.in
index 862e160..81cafd5 100644
--- a/plugins/minio/MANIFEST.in
+++ b/plugins/minio/MANIFEST.in
@@ -1 +1,2 @@
 recursive-include tutorminio/patches *
+recursive-include tutorminio/templates *
diff --git a/plugins/minio/setup.py b/plugins/minio/setup.py
index 326d68c..15e2159 100644
--- a/plugins/minio/setup.py
+++ b/plugins/minio/setup.py
@@ -1,6 +1,6 @@
 import io
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -10,7 +10,7 @@ with io.open(os.path.join(here, "README.rst"), "rt", encoding="utf8") as f:
 
 setup(
     name="tutor-minio",
-    version="0.1.0",
+    version="0.1.1",
     url="https://docs.tutor.overhang.io/",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",
@@ -23,7 +23,7 @@ setup(
     author_email="contact@overhang.io",
     description="A Tutor plugin for object storage in MinIO",
     long_description=readme,
-    packages=["tutorminio"],
+    packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.5",
     entry_points={"tutor.plugin.v0": ["minio = tutorminio.plugin"]},
diff --git a/plugins/notes/MANIFEST.in b/plugins/notes/MANIFEST.in
index c98e3d2..04d5eb7 100644
--- a/plugins/notes/MANIFEST.in
+++ b/plugins/notes/MANIFEST.in
@@ -1 +1,2 @@
 recursive-include tutornotes/patches *
+recursive-include tutornotes/templates *
diff --git a/plugins/notes/setup.py b/plugins/notes/setup.py
index 978ba4c..da93a8f 100644
--- a/plugins/notes/setup.py
+++ b/plugins/notes/setup.py
@@ -1,6 +1,6 @@
 import io
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -10,7 +10,7 @@ with io.open(os.path.join(here, "README.rst"), "rt", encoding="utf8") as f:
 
 setup(
     name="tutor-notes",
-    version="0.0.2",
+    version="0.1.0",
     url="https://docs.tutor.overhang.io/",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",
@@ -23,7 +23,7 @@ setup(
     author_email="contact@overhang.io",
     description="A Tutor plugin for student notes",
     long_description=readme,
-    packages=["tutornotes"],
+    packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.5",
     entry_points={"tutor.plugin.v0": ["notes = tutornotes.plugin"]},
diff --git a/plugins/xqueue/MANIFEST.in b/plugins/xqueue/MANIFEST.in
index ed8e9ef..16646ee 100644
--- a/plugins/xqueue/MANIFEST.in
+++ b/plugins/xqueue/MANIFEST.in
@@ -1 +1,2 @@
 recursive-include tutorxqueue/patches *
+recursive-include tutorxqueue/templates *
diff --git a/plugins/xqueue/setup.py b/plugins/xqueue/setup.py
index 674a53a..b16618a 100644
--- a/plugins/xqueue/setup.py
+++ b/plugins/xqueue/setup.py
@@ -1,6 +1,6 @@
 import io
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -10,7 +10,7 @@ with io.open(os.path.join(here, "README.rst"), "rt", encoding="utf8") as f:
 
 setup(
     name="tutor-xqueue",
-    version="0.0.1",
+    version="0.1.0",
     url="https://docs.tutor.overhang.io/",
     project_urls={
         "Documentation": "https://docs.tutor.overhang.io/",
@@ -23,7 +23,7 @@ setup(
     author_email="contact@overhang.io",
     description="A Tutor plugin for Xqueue (external grading system)",
     long_description=readme,
-    packages=["tutorxqueue"],
+    packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.5",
     entry_points={"tutor.plugin.v0": ["xqueue = tutorxqueue.plugin"]},
diff --git a/plugins/xqueue/tutorxqueue/templates/xqueue/apps/xqueue/settings/tutor.py b/plugins/xqueue/tutorxqueue/templates/xqueue/apps/settings/tutor.py
similarity index 100%
rename from plugins/xqueue/tutorxqueue/templates/xqueue/apps/xqueue/settings/tutor.py
rename to plugins/xqueue/tutorxqueue/templates/xqueue/apps/settings/tutor.py