diff --git a/.github/main.workflow b/.github/main.workflow
deleted file mode 100644
index 33001ee69..000000000
--- a/.github/main.workflow
+++ /dev/null
@@ -1,9 +0,0 @@
-workflow "Code linting" {
-  on = "push"
-  resolves = ["Flake8"]
-}
-
-action "Flake8" {
-  uses = "cclauss/GitHub-Action-for-Flake8@0.0.1"
-  args = "flake8 galaxy/"
-}
diff --git a/galaxyui/src/app/home/home.component.html b/galaxyui/src/app/home/home.component.html
index ed0b926cd..4993a5083 100644
--- a/galaxyui/src/app/home/home.component.html
+++ b/galaxyui/src/app/home/home.component.html
@@ -1,11 +1,3 @@
-<div class="alert alert-warning">
-  <i style="font-size: 30px;" class="pficon fa fa-info-circle"></i>
-  <span style="font-size: 16px;">
-    Please take our <a href="https://www.surveymonkey.co.uk/r/2L6YW89" target="_blank">Ansible GalaxyNG
-    Roadmap Survey</a> to help us port Galaxy to the new <a href="https://github.com/ansible/galaxy_ng" target="_blank">galaxy_ng</a> codebase.
-  </span>
-
-</div>
 <app-page-header [headerTitle]="headerTitle" [headerIcon]='headerIcon'></app-page-header>
 <div id="home-page" class="container-fluid" (window:resize)="onResize($event)">
 
diff --git a/requirements/requirements.in b/requirements/requirements.in
index c04650d31..e0771e583 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -1,8 +1,8 @@
 # Common
 # NOTE(cutwater): Probably some of requirements below are obsolete.
 #                 Review required.
-ansible>=2.9.7
-galaxy-importer==0.3.0
+ansible-core>=2.11,<2.12
+galaxy-importer==0.3.4
 gunicorn==19.7.1
 markdown
 marshmallow
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 05f08863b..3b4134dd8 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile --output-file=requirements/requirements.txt requirements/requirements.in
@@ -10,11 +10,11 @@ alabaster==0.7.12
     # via sphinx
 amqp==1.4.9
     # via kombu
-ansible-lint==5.0.3
+ansible-core==2.11.2
     # via
     #   -r requirements/requirements.in
     #   galaxy-importer
-ansible==2.9.7
+ansible-lint==5.0.12
     # via
     #   -r requirements/requirements.in
     #   galaxy-importer
@@ -22,7 +22,7 @@ anyjson==0.3.3
     # via kombu
 async-timeout==3.0.1
     # via aiohttp
-attrs==19.3.0
+attrs==21.2.0
     # via
     #   aiohttp
     #   galaxy-importer
@@ -30,10 +30,10 @@ babel==2.6.0
     # via sphinx
 billiard==3.3.0.23
     # via celery
-bleach-allowlist==1.0.3
-    # via galaxy-importer
 bleach==3.3.0
     # via galaxy-importer
+bleach-allowlist==1.0.3
+    # via galaxy-importer
 boto3==1.9.107
     # via django-storages
 botocore==1.12.107
@@ -72,15 +72,29 @@ coreschema==0.0.4
     #   drf-yasg
 cryptography==3.4.3
     # via
-    #   ansible
+    #   ansible-core
     #   pyjwt
     #   pyopenssl
+dataclasses==0.8
+    # via rich
 defusedxml==0.5.0
     # via python3-openid
 deprecated==1.2.4
     # via pygithub
 dj-database-url==0.5.0
     # via -r requirements/requirements.in
+django==2.2.19
+    # via
+    #   -r requirements/requirements.in
+    #   django-allauth
+    #   django-bootstrap-form
+    #   django-celery
+    #   django-filter
+    #   django-log-request-id
+    #   django-storages
+    #   drf-nested-routers
+    #   drf-yasg
+    #   pulpcore
 django-allauth==0.43.0
     # via -r requirements/requirements.in
 django-bootstrap-form==3.4
@@ -97,26 +111,14 @@ django-prometheus==1.0.15
     # via -r requirements/requirements.in
 django-storages[boto3]==1.7.1
     # via -r requirements/requirements.in
-django==2.2.19
+djangorestframework==3.7.7
     # via
     #   -r requirements/requirements.in
-    #   django-allauth
-    #   django-bootstrap-form
-    #   django-celery
-    #   django-filter
-    #   django-log-request-id
-    #   django-storages
     #   drf-nested-routers
     #   drf-yasg
     #   pulpcore
 djangorestframework-queryfields==1.0.0
     # via pulpcore
-djangorestframework==3.7.7
-    # via
-    #   -r requirements/requirements.in
-    #   drf-nested-routers
-    #   drf-yasg
-    #   pulpcore
 docutils==0.14
     # via
     #   botocore
@@ -130,13 +132,11 @@ dynaconf==1.2.0
     # via pulpcore
 enrich==1.2.6
     # via ansible-lint
-entrypoints==0.3
-    # via flake8
-flake8==3.7.9
+flake8==3.9.2
     # via
     #   -r requirements/requirements.in
     #   galaxy-importer
-galaxy-importer==0.3.0
+galaxy-importer==0.3.4
     # via -r requirements/requirements.in
 gunicorn==19.7.1
     # via
@@ -144,10 +144,17 @@ gunicorn==19.7.1
     #   pulpcore
 idna==2.7
     # via
+    #   idna-ssl
     #   requests
     #   yarl
+idna-ssl==1.1.0
+    # via aiohttp
 imagesize==1.1.0
     # via sphinx
+importlib-metadata==4.5.0
+    # via
+    #   flake8
+    #   markdown
 inflection==0.3.1
     # via drf-yasg
 influxdb==5.2.1
@@ -156,7 +163,7 @@ itypes==1.1.0
     # via coreapi
 jinja2==2.10.1
     # via
-    #   ansible
+    #   ansible-core
     #   coreschema
     #   sphinx
 jmespath==0.9.4
@@ -167,7 +174,7 @@ jog==0.1.1
     # via -r requirements/requirements.in
 kombu==3.0.37
     # via celery
-markdown==3.2.1
+markdown==3.3.4
     # via
     #   -r requirements/requirements.in
     #   galaxy-importer
@@ -185,6 +192,7 @@ oauthlib==2.1.0
     # via requests-oauthlib
 packaging==18.0
     # via
+    #   ansible-core
     #   ansible-lint
     #   bleach
     #   sphinx
@@ -200,11 +208,11 @@ psycopg2-binary==2.7.6.1
     #   pulpcore
 pulpcore==3.0.0b21
     # via -r requirements/requirements.in
-pycodestyle==2.5.0
+pycodestyle==2.7.0
     # via flake8
 pycparser==2.19
     # via cffi
-pyflakes==2.1.0
+pyflakes==2.3.1
     # via flake8
 pygithub==1.43.3
     # via -r requirements/requirements.in
@@ -238,21 +246,17 @@ pytz==2018.7
     #   celery
     #   django
     #   influxdb
-pyyaml==5.3.1
+pyyaml==5.4.1
     # via
     #   -r requirements/requirements.in
-    #   ansible
+    #   ansible-core
     #   ansible-lint
     #   galaxy-importer
     #   pulpcore
     #   yamllint
 redis==3.0.1
     # via rq
-requests-oauthlib==1.0.0
-    # via
-    #   -r requirements/requirements.in
-    #   django-allauth
-requests==2.23.0
+requests==2.25.1
     # via
     #   -r requirements/requirements.in
     #   coreapi
@@ -262,6 +266,12 @@ requests==2.23.0
     #   pygithub
     #   requests-oauthlib
     #   sphinx
+requests-oauthlib==1.0.0
+    # via
+    #   -r requirements/requirements.in
+    #   django-allauth
+resolvelib==0.5.4
+    # via ansible-core
 rich==9.13.0
     # via
     #   ansible-lint
@@ -276,7 +286,7 @@ ruamel.yaml==0.15.85
     #   drf-yasg
 s3transfer==0.2.0
     # via boto3
-semantic-version==2.8.4
+semantic-version==2.8.5
     # via
     #   -r requirements/requirements.in
     #   galaxy-importer
@@ -290,6 +300,7 @@ six==1.12.0
     #   pyopenssl
     #   python-dateutil
     #   sphinx
+    #   tenacity
 snowballstemmer==1.2.1
     # via sphinx
 sphinx==1.7.9
@@ -298,11 +309,15 @@ sphinxcontrib-websupport==1.1.0
     # via sphinx
 sqlparse==0.3.1
     # via django
+tenacity==7.0.0
+    # via ansible-lint
 toml==0.10.0
     # via dynaconf
 typing-extensions==3.7.4.3
     # via
     #   aiohttp
+    #   ansible-lint
+    #   importlib-metadata
     #   rich
 uritemplate==3.0.0
     # via
@@ -324,6 +339,8 @@ yamllint==1.13.0
     # via -r requirements/requirements.in
 yarl==1.3.0
     # via aiohttp
+zipp==3.4.1
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools