diff --git a/.gitmodules b/.gitmodules
index 4ba5d55..d827988 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,6 @@
 [submodule "ckan-extensions/ckanext-unaids"]
 	path = submodules/ckanext-unaids
 	url = git@github.com:/fjelltopp/ckanext-unaids.git
-[submodule "ckan-extensions/ckanext-validation"]
-	path = submodules/ckanext-validation
-	url = git@github.com:frictionlessdata/ckanext-validation.git
 [submodule "ckan-extensions/ckanext-blob-storage"]
 	path = submodules/ckanext-blob-storage
 	url = git@github.com:/fjelltopp/ckanext-blob-storage.git
@@ -46,5 +43,6 @@
 [submodule "submodules/giftless"]
 	path = submodules/giftless
 	url = git@github.com:/fjelltopp/giftless.git
-[submodule "submodules/ckanext-validation"]
+[submodule "ckan-extensions/ckanext-validation"]
+    path = submodules/ckanext-validation
 	url = git@github.com:fjelltopp/ckanext-validation.git
diff --git a/Pipfile b/Pipfile
index efc3549..c4fedd2 100644
--- a/Pipfile
+++ b/Pipfile
@@ -104,10 +104,8 @@ python-dotenv = "==1.0.0"
 python-jose = "==3.3.0"
 setuptools = "==67.2.0"
 raven = "==6.10.0"
-
 frictionless = "==5.0.0b9"
 tableschema = "*"
-jinja2 = "==3.0"
 
 [dev-packages]
 beautifulsoup4 = "==4.9.1"
diff --git a/Pipfile.lock b/Pipfile.lock
index 71df764..7e8bb52 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "2aeb603736f48239303701ede511c12c3fb715bf3b4eb6e050333e57f00af06a"
+            "sha256": "87f006901a2bfd4459ec8c70983eb7d7086cd6d9023782f36ec6d3cbe0760d9b"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -581,11 +581,11 @@
         },
         "jinja2": {
             "hashes": [
-                "sha256:2f2de5285cf37f33d33ecd4a9080b75c87cd0c1994d5a9c6df17131ea1f049c6",
-                "sha256:ea8d7dd814ce9df6de6a761ec7f1cac98afe305b8cdc4aaae4e114b8d8ce24c5"
+                "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
+                "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
             ],
-            "index": "pypi",
-            "version": "==3.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==3.1.2"
         },
         "jmespath": {
             "hashes": [
@@ -1917,7 +1917,7 @@
                 "sha256:c7b80eb7f5a855a88efc971fda506ff7a91c280b42cdae26643e0f601ea281ea",
                 "sha256:ea8801f15dfe4ffb76dea1b09b847430ffd70d827b41735c64a0638a04103bfc"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version >= '3.4'",
             "version": "==8.12.2"
         },
         "itsdangerous": {
@@ -1954,11 +1954,11 @@
         },
         "jinja2": {
             "hashes": [
-                "sha256:2f2de5285cf37f33d33ecd4a9080b75c87cd0c1994d5a9c6df17131ea1f049c6",
-                "sha256:ea8d7dd814ce9df6de6a761ec7f1cac98afe305b8cdc4aaae4e114b8d8ce24c5"
+                "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
+                "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
             ],
-            "index": "pypi",
-            "version": "==3.0"
+            "markers": "python_version >= '3.7'",
+            "version": "==3.1.2"
         },
         "jinja2-time": {
             "hashes": [
diff --git a/ckan/adx_config.ini b/ckan/adx_config.ini
index fd91748..8842a83 100644
--- a/ckan/adx_config.ini
+++ b/ckan/adx_config.ini
@@ -124,7 +124,7 @@ ckan.redis.url = redis://redis:6379/1
 #   Add ``resource_proxy`` to enable resorce proxying and get around the
 #   same origin policy
 # Note: Plugins to the left take precendence over plugins to the right!!! Opposite to what you might expect.
-ckan.plugins = unaids fork blob_storage saml2auth emailasusername restricted authz_service stats
+ckan.plugins = unaids fork scheming_datasets blob_storage saml2auth emailasusername restricted authz_service stats
   text_view image_view unaids_recline_view recline_graph_view recline_map_view recline_grid_view
   resource_proxy geo_view pdf_view datastore datapusher geojson_view composite
   validation repeating ytp_request pages dhis2harvester_plugin dhis2_pivot_tables_harvester harvest sentry versions
@@ -165,7 +165,7 @@ ckanext.authz_service.jwt_private_key = -----BEGIN RSA PRIVATE KEY-----
 ckanext.authz_service.jwt_public_key_file = /etc/ckan/jwt_public_key.pem
 ckanext.bulk_file_uploader_default_fields = {"restricted_allowed_orgs": "unaids"}
 
-ckanext.unaids.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
+ckanext.validation.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
 ckanext.validation.run_on_create_async = True
 ckanext.validation.run_on_update_async = True
 ckanext.validation.run_on_create_sync = False
diff --git a/ckan/bootstrap.sh b/ckan/bootstrap.sh
index dd5e036..b14660a 100755
--- a/ckan/bootstrap.sh
+++ b/ckan/bootstrap.sh
@@ -19,6 +19,9 @@ fi
 rm -rf /usr/lib/adx/submodules/ckan/ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info
 cd /usr/lib/adx/ || exit 1
 pipenv sync --dev
+pipenv run python -m pip install --no-warn-conflicts jinja2==2.11
+pipenv run python -c "import jinja2; print(jinja2.__version__)"
+pipenv run python -m pip freeze
 echo "show current dir"
 ls -la
 echo "Show local/bin"
diff --git a/submodules/ckanext-blob-storage b/submodules/ckanext-blob-storage
index 22ec1cd..184327d 160000
--- a/submodules/ckanext-blob-storage
+++ b/submodules/ckanext-blob-storage
@@ -1 +1 @@
-Subproject commit 22ec1cd3077f0d814b05bde768d9fefa162d4851
+Subproject commit 184327db22a9e74319acda29986bbfcfe069ced9
diff --git a/submodules/ckanext-dhis2harvester b/submodules/ckanext-dhis2harvester
index ec7b84c..2de5037 160000
--- a/submodules/ckanext-dhis2harvester
+++ b/submodules/ckanext-dhis2harvester
@@ -1 +1 @@
-Subproject commit ec7b84cc927113b136da490dd432aa5457c967e7
+Subproject commit 2de5037159d133f8ddcbd563ac973d88dad5feaf
diff --git a/submodules/ckanext-emailasusername b/submodules/ckanext-emailasusername
index 1666a2d..624da7a 160000
--- a/submodules/ckanext-emailasusername
+++ b/submodules/ckanext-emailasusername
@@ -1 +1 @@
-Subproject commit 1666a2dd7a1644940f81daa289b8bd4d9296d491
+Subproject commit 624da7a4f346eb11985559d9858b56f678b64a02
diff --git a/submodules/ckanext-fork b/submodules/ckanext-fork
index 59a69ee..784ef47 160000
--- a/submodules/ckanext-fork
+++ b/submodules/ckanext-fork
@@ -1 +1 @@
-Subproject commit 59a69eee8ec06c6191c1694dd7e233b999227ee0
+Subproject commit 784ef47eed4e9e885e9961bec6d373942c67c83d
diff --git a/submodules/ckanext-restricted b/submodules/ckanext-restricted
index f0012f3..81924c1 160000
--- a/submodules/ckanext-restricted
+++ b/submodules/ckanext-restricted
@@ -1 +1 @@
-Subproject commit f0012f3d83e7dea072c5ee97732095769b256092
+Subproject commit 81924c1d2ae2147ccb113ee710419a777728e512
diff --git a/submodules/ckanext-unaids b/submodules/ckanext-unaids
index 6f5168f..ac5c1aa 160000
--- a/submodules/ckanext-unaids
+++ b/submodules/ckanext-unaids
@@ -1 +1 @@
-Subproject commit 6f5168f93fa845ae3e659eafc1b3cac1cad7f293
+Subproject commit ac5c1aa9483ce7bceafe488fea8b905b38e28192
diff --git a/submodules/giftless b/submodules/giftless
index d1dbbc4..7ee51c5 160000
--- a/submodules/giftless
+++ b/submodules/giftless
@@ -1 +1 @@
-Subproject commit d1dbbc4798047027684891c0d0ab4f75282cd45a
+Subproject commit 7ee51c5f7644e5478dae3e7c963c12f6d0f9bc4c
diff --git a/submodules/unaids_data_specifications b/submodules/unaids_data_specifications
index e1a135e..21ea890 160000
--- a/submodules/unaids_data_specifications
+++ b/submodules/unaids_data_specifications
@@ -1 +1 @@
-Subproject commit e1a135e45ecbf2e2ced6a8840053c1ecfe3d76f6
+Subproject commit 21ea89022ea78193baa60dfb70527de9ad9ba99f