diff --git a/LICENSE b/LICENSE
index da1c35ae..40e49f2e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 kube-fluentd-operator
 
-Copyright 2018 VMware, Inc.  All rights reserved				
+Copyright 2022 VMware, Inc.  All rights reserved				
 
 The BSD-2 license (the ìLicenseî) set forth below applies to all parts of the kube-fluentd-operator
 project.  You may not use this file except in compliance with the License.†
diff --git a/base-image/Dockerfile b/base-image/Dockerfile
index 994e66f9..53a37d0d 100644
--- a/base-image/Dockerfile
+++ b/base-image/Dockerfile
@@ -3,7 +3,7 @@
 # Similar to https://github.com/drecom/docker-centos-ruby/blob/2.6.5-slim/Dockerfile
 
 ARG RVM_PATH=/usr/local/rvm
-ARG RUBY_VERSION=ruby-2.7.5
+ARG RUBY_VERSION=ruby-2.7.6
 ARG RUBY_PATH=/usr/local/rvm/rubies/$RUBY_VERSION
 ARG RUBYOPT='-W:no-deprecated -W:no-experimental'
 
@@ -58,6 +58,7 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
     && rvm install --disable-binary $RUBY_VERSION --default \
     && gem update --system --no-document \
     && gem install bundler -v '>= 2.3.4' --default --no-document \
+    && gem install cgi -v '>= 0.1.1' --default --no-document \
     && gem install rexml -v '>= 3.2.5' --default --no-document \
     && gem install json -v '>= 2.6.1' --default --no-document \
     && gem install webrick -v '>= 1.7.0' --default --no-document \
@@ -69,7 +70,8 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.3.0.gemspec \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.5.1.gemspec \
     && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/webrick-1.6.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/date-3.0.3.gemspec
+    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/date-3.0.3.gemspec \
+    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.1.gemspec
 
 FROM photon:3.0
 ARG RUBY_PATH
@@ -150,7 +152,8 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
   && ln -s $(which fluentd) /usr/local/bundle/bin/fluentd \
   && tdnf remove -y $buildDeps \
   && tdnf clean all \
-  && gem uninstall google-protobuf --version 3.17.3 --force && gem cleanup
+  && gem uninstall google-protobuf --version 3.17.3 --force && gem cleanup \
+  && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/cache $RUBY_PATH/lib/ruby/gems/2.7.0/doc/ /usr/share/doc /root/.bundle/cache
 
 # Make sure fluentd picks jemalloc 3.6.0 lib as default
 ENV LD_PRELOAD="/usr/lib/libjemalloc.so"
diff --git a/config-reloader/Dockerfile b/config-reloader/Dockerfile
index fe6c1f60..ae40856a 100644
--- a/config-reloader/Dockerfile
+++ b/config-reloader/Dockerfile
@@ -1,8 +1,8 @@
-# Copyright © 2018 VMware, Inc. All Rights Reserved.
+# Copyright © 2022 VMware, Inc. All Rights Reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
 # builder image
-FROM golang:1.17 as builder
+FROM golang:1.17.9 as builder
 
 WORKDIR /go/src/github.com/vmware/kube-fluentd-operator/config-reloader
 COPY . .
diff --git a/config-reloader/validate-from-dir.sh b/config-reloader/validate-from-dir.sh
index 5c864dd4..53d6395f 100755
--- a/config-reloader/validate-from-dir.sh
+++ b/config-reloader/validate-from-dir.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-dest=`mktemp -d`
+dest=$(mktemp -d)
 
 config-reloader \
   --interval 0 \
@@ -14,7 +14,7 @@ config-reloader \
 
 rc=0
 
-for st in `find ${dest} -iname *.status`; do
+for st in $(find ${dest} -iname *.status); do
   ns=$(basename ${st})
   ns=${ns%%.status}
   ns=${ns#ns-}