diff --git a/.rubocop.yml b/.rubocop.yml
index 0c8b68a983f9622922771b0468c24c38356ee76e_LnJ1Ym9jb3AueW1s..33cd7d99eb187a3844834ee6706e2407b68eceef_LnJ1Ym9jb3AueW1s 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -71,3 +71,6 @@
     - docker/**/*
     - lib/gitlab/util.rb
     - spec/gitlab/util_spec.rb
+
+Style/MultilineIfModifier:
+  Enabled: false
diff --git a/files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb b/files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvbGlicmFyaWVzL2Zkd19oZWxwZXIucmI=..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvbGlicmFyaWVzL2Zkd19oZWxwZXIucmI= 100644
--- a/files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb
+++ b/files/gitlab-cookbooks/gitlab-ee/libraries/fdw_helper.rb
@@ -1,4 +1,4 @@
-class FdwHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(GitlabGeoHelper)` at the end of the class definition)
+class FdwHelper
   FOREIGN_SCHEMA = 'gitlab_secondary'.freeze
   DEFAULT_SCHEMA = 'public'.freeze
 
diff --git a/files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb b/files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvbGlicmFyaWVzL2dpdGxhYl9nZW9faGVscGVyLnJi..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvbGlicmFyaWVzL2dpdGxhYl9nZW9faGVscGVyLnJi 100644
--- a/files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb
+++ b/files/gitlab-cookbooks/gitlab-ee/libraries/gitlab_geo_helper.rb
@@ -1,4 +1,4 @@
-class GitlabGeoHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(GitlabGeoHelper)` at the end of the class definition)
+class GitlabGeoHelper
   REVISION_FILE ||= '/opt/gitlab/embedded/service/gitlab-rails/REVISION'.freeze
 
   attr_reader :node
diff --git a/files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb b/files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2dpdGxhYl9yYWlscy5yYg==..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2dpdGxhYl9yYWlscy5yYg== 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb
@@ -17,11 +17,7 @@
 require_relative 'nginx.rb'
 require_relative '../../gitaly/libraries/gitaly.rb'
 
-module GitlabRails # rubocop:disable Style/MultilineIfModifier
-  # The guard clause at the end of this module is used only to get the tests
-  # running. It prevents reloading of the module during converging, so tests
-  # pass. Hence, disabling the cop.
-
+module GitlabRails
   class << self
     def parse_variables
       parse_database_adapter
diff --git a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg==..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
+++ b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
@@ -1,7 +1,7 @@
 require_relative '../../gitlab/libraries/helpers/authorizer_helper'
 require_relative '../../package/libraries/helpers/shell_out_helper'
 
-class MattermostHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(MattermostHelper)` at the end of the class definition)
+class MattermostHelper
   extend ShellOutHelper
   extend AuthorizeHelper
 
diff --git a/files/gitlab-cookbooks/package/libraries/config/roles/default.rb b/files/gitlab-cookbooks/package/libraries/config/roles/default.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9jb25maWcvcm9sZXMvZGVmYXVsdC5yYg==..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9jb25maWcvcm9sZXMvZGVmYXVsdC5yYg== 100644
--- a/files/gitlab-cookbooks/package/libraries/config/roles/default.rb
+++ b/files/gitlab-cookbooks/package/libraries/config/roles/default.rb
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-module DefaultRole # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(DefaultRole)` at the end of the class definition)
+module DefaultRole
   class << self
     def load_role
       # Default role is only enabled if no other service role is enabled
diff --git a/files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb b/files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3NlcnZpY2VzX2hlbHBlci5yYg==..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3NlcnZpY2VzX2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb
+++ b/files/gitlab-cookbooks/package/libraries/helpers/services_helper.rb
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-module Services # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(Services)` at the end of the class definition)
+module Services
   ALL_SERVICES = 'all'.freeze
   ALL_GROUPS = 'all-groups'.freeze
   SYSTEM_GROUP = 'system'.freeze
diff --git a/files/gitlab-cookbooks/package/libraries/helpers/version_helper.rb b/files/gitlab-cookbooks/package/libraries/helpers/version_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3ZlcnNpb25faGVscGVyLnJi..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9oZWxwZXJzL3ZlcnNpb25faGVscGVyLnJi 100644
--- a/files/gitlab-cookbooks/package/libraries/helpers/version_helper.rb
+++ b/files/gitlab-cookbooks/package/libraries/helpers/version_helper.rb
@@ -1,6 +1,6 @@
 require_relative 'shell_out_helper'
 
-class VersionHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(VersionHelper)` at the end of the class definition)
+class VersionHelper
   extend ShellOutHelper
 
   def self.version(cmd, env: {})
diff --git a/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb b/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb
index 0c8b68a983f9622922771b0468c24c38356ee76e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9vbW5pYnVzX2hlbHBlci5yYg==..33cd7d99eb187a3844834ee6706e2407b68eceef_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9vbW5pYnVzX2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb
+++ b/files/gitlab-cookbooks/package/libraries/omnibus_helper.rb
@@ -2,7 +2,7 @@
 require_relative 'helper'
 require_relative 'deprecations'
 
-class OmnibusHelper # rubocop:disable Style/MultilineIfModifier (disabled so we can use `unless defined?(OmnibusHelper)` at the end of the class definition)
+class OmnibusHelper
   include ShellOutHelper
   attr_reader :node