diff --git a/python36.yaml b/python36.yaml
new file mode 100644
index 0000000..fb8f649
--- /dev/null
+++ b/python36.yaml
@@ -0,0 +1,140 @@
+document: modulemd
+version: 2
+data:
+  name: python36
+  stream: '3.6'
+  summary: Python programming language, version 3.6
+  description: 'This module gives users access to the internal Python 3.6 in RHEL8,
+    as
+
+    well as provides some additional Python packages the users might need.
+
+    In addition to these you can install any python3-* package available
+
+    in RHEL and use it with Python from this module.'
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform:
+      - el8
+      mongodb:
+      - 3.6
+    requires:
+      platform:
+      - el8
+  references:
+    community: https://www.python.org/
+    documentation: https://docs.python.org/3.6/
+  profiles:
+    common:
+      rpms:
+      - python36
+    build:
+      rpms:
+      - python36
+      - python36-devel
+      - python36-rpm-macros
+  filter:
+    rpms:
+    - python2-PyMySQL
+    - python2-docutils
+    - python2-nose
+    - python2-pygments
+    - python2-scipy
+    - python2-sqlalchemy
+    - python2-virtualenv
+  api:
+    rpms:
+    - python-sqlalchemy-doc
+    - python-virtualenv-doc
+    - python3-PyMySQL
+    - python3-bson
+    - python3-docs
+    - python3-docutils
+    - python3-nose
+    - python3-pygments
+    - python3-pymongo
+    - python3-pymongo-gridfs
+    - python3-scipy
+    - python3-sqlalchemy
+    - python3-virtualenv
+    - python3-wheel
+    - python36
+    - python36-debug
+    - python36-devel
+    - python36-rpm-macros
+  buildopts:
+    rpms:
+      macros: '%_without_python2 1
+
+
+        # For packages depending on python36, so that they
+
+        # BuildRequire python36-devel/debug/rpm-macros instead of python3-*
+
+        #
+
+        # This won''t be necessary for python37 and later. There we can
+
+        # set %{python3_pkgversion}, because all packages will need to
+
+        # have the pythonXY prefix. Whereas for Python 3.6 the packages
+
+        # are split between non-modular RHEL and the python36 module,
+
+        # and so it was easier and less confusing to keep the prefix at
+
+        # python3- except for the devel/debug/rpm/macros packages.
+
+        %_with_python36_module 1
+
+        '
+  components:
+    rpms:
+      python36:
+        rationale: Contains the symlink to the platform-python interpreter. Also contains
+          python36-rpm-macros needed to build the remaining packages.
+        ref: 4ab655437f6ca15be881ea1cf4cbfb061f8433db
+        buildorder: 10
+      python-PyMySQL:
+        rationale: Python adapter for the MySQL/MariaDB databases
+        ref: b4d23687c43c447aaabcc7222af637b1b5549bb5
+        buildorder: 20
+      python-docutils:
+        rationale: System for processing plaintext documentation
+        ref: cc382ee2675e555fb0e5e7a2f1b90b3692c54da0
+        buildorder: 20
+      python-nose:
+        rationale: Discovery-based unit test extension for Python
+        ref: 12ecc8081c7832ec2097ee61565478bac7afbeb8
+        buildorder: 20
+      python-pygments:
+        rationale: Syntax highlighting engine written in Python
+        ref: dd3d68d8eb73c067fee556a9485bd358bb4f7d2f
+        buildorder: 20
+      python-pymongo:
+        rationale: Python driver for MongoDB
+        ref: d536181bdd5af6d4d264d0278f4c2e9c5fcd2759
+        buildorder: 20
+      python-sqlalchemy:
+        rationale: Modular and flexible ORM library for python
+        ref: 82df94a92f274fbd8e9e75261bafb6e50c2ee2cc
+        buildorder: 20
+      python-virtualenv:
+        rationale: Tool to create isolated Python environments
+        ref: d98baee53300656ed0e9618c5f9acb341d853e8c
+        buildorder: 20
+      python-wheel:
+        rationale: Built-package format for Python
+        ref: 52f6bcd8194d5442553535aaa815b9a13485d71a
+        buildorder: 20
+      scipy:
+        rationale: Scientific Tools for Python
+        ref: 4d01c8f45ceb75a3390aa87deeaf5b9bad795b8f
+        buildorder: 20
+      python-docs:
+        rationale: Documentation for Python
+        ref: f375eb7989b9ee6d40d54f11a6cda5db291791cb
+        buildorder: 20