diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 758a9ef8f8..f5b149e053 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -67,6 +67,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 # Ruby.
     {% set fluentd_plugins = [
         'fluentd:"<1.9.0"',
+        'elasticsearch:"<7.6.0"',
         'faraday:"~>0.15.4"',
         'fluent-plugin-elasticsearch:4.0.0',
         'fluent-plugin-grep',
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2
index 9eaa1e6502..23087b2f0c 100644
--- a/docker/sensu/sensu-client/Dockerfile.j2
+++ b/docker/sensu/sensu-client/Dockerfile.j2
@@ -50,7 +50,6 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
 # Let's cap them to the known major version that works with the ruby shipped on
 # rhel/centos/oraclelinux (currently 2.0)
 {% set sensu_plugins = [
-    'ceph:"~>1"',
     'cpu-checks:"~>1"',
     'disk-checks:"~>2"',
     'dns:"~>1"',
@@ -68,7 +67,6 @@ RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
     'network-checks:"~>2"',
     'ntp:"~>1"',
     'openstack:"~>1"',
-    'process-checks:"~>2"',
     'rabbitmq:"~>3"',
     'redis:"~>2"',
     'uptime-checks:"~>1"',
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 4bb5159b98..c95bb08e0b 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -339,11 +339,11 @@ SOURCES = {
     'freezer-api': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-api/'
-                     'freezer-api-master.tar.gz')},
+                     'freezer-api-6.0.0.tar.gz')},
     'freezer-base': {
         'type': 'url',
         'location': ('$tarballs_base/freezer/'
-                     'freezer-master.tar.gz')},
+                     'freezer-6.0.0.tar.gz')},
     'glance-base': {
         'type': 'url',
         'location': ('$tarballs_base/glance/'
@@ -384,7 +384,7 @@ SOURCES = {
     'horizon-plugin-freezer-web-ui': {
         'type': 'url',
         'location': ('$tarballs_base/freezer-web-ui/'
-                     'freezer-web-ui-master.tar.gz')},
+                     'freezer-web-ui-6.0.0.tar.gz')},
     'horizon-plugin-heat-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/heat-dashboard/'
@@ -726,10 +726,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/telemetry-tempest-plugin/'
                      'telemetry_tempest_plugin-0.1.0.tar.gz')},
-    'tempest-plugin-tripleo-common': {
-        'type': 'url',
-        'location': ('$tarballs_base/tripleo-common-tempest-plugin/'
-                     'tripleo-common-tempest-plugin-master.tar.gz')},
     'tempest-plugin-trove': {
         'type': 'url',
         'location': ('$tarballs_base/trove-tempest-plugin/'